mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-08 16:05:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

corrected json syntax errorallow maxAge 0 in settings.json

Browse source
This commit is contained in:
Matthias Bartelmeß 2012-03-27 17:33:05 +02:00
parent a60205f3dc
commit f67475d4af
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/node/server.js
View file

@ -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)"; var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";
//cache 6 hours, by default //cache 6 hours, by default
var hour = 60*60; exports.maxAge = settings.maxAge;
exports.maxAge = settings.maxAge || 6 * hour;
//set loglevel //set loglevel
log4js.setGlobalLogLevel(settings.loglevel); log4js.setGlobalLogLevel(settings.loglevel);

2
src/node/utils/Settings.js
View file

@ -63,7 +63,7 @@ exports.editOnly = false;
/** /**
* Max age that responses will have (affects caching layer). * 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 * A flag that shows if minification is enabled or not