From f67475d4af8a13ad7dd6e9b2e502fa750ae5fc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Tue, 27 Mar 2012 17:33:05 +0200 Subject: [PATCH] corrected json syntax errorallow maxAge 0 in settings.json --- src/node/server.js | 3 +-- src/node/utils/Settings.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/node/server.js b/src/node/server.js index 8e6d6fa0b..f6d551d44 100644 --- a/src/node/server.js +++ b/src/node/server.js @@ -52,8 +52,7 @@ console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues") var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)"; //cache 6 hours, by default -var hour = 60*60; -exports.maxAge = settings.maxAge || 6 * hour; +exports.maxAge = settings.maxAge; //set loglevel log4js.setGlobalLogLevel(settings.loglevel); diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 24237de49..0caadd22d 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -63,7 +63,7 @@ exports.editOnly = false; /** * Max age that responses will have (affects caching layer). */ -exports.maxAge = 1000*60*60*6; // 6 hours +exports.maxAge = 60*60*6; // 6 hours /** * A flag that shows if minification is enabled or not