public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-enabled maxAge setting. maxAge is now in seconds, not milliseconds.

pull/570/head
Matthias Bartelmeß 2012-03-23 19:28:46 +01:00
parent cccd8a923c
commit c407ad3d34
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings.json.template
View File

@ -39,9 +39,9 @@
but makes it impossible to debug the javascript/css */
"minify" : true,
/* How long may clients use served javascript code? Without versioning this
is may cause problems during deployment. */
"maxAge" : 21600000, // 6 hours
/* How long may clients use served javascript code (in seconds)? Without versioning this
is may cause problems during deployment. Set to 0 to disable caching */
"maxAge" : 21600, // 6 hours
/* This is the path to the Abiword executable. Setting it to null, disables abiword.
Abiword is needed to enable the import/export of pads*/

5
src/node/server.js
View File

@ -51,8 +51,9 @@ 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
exports.maxAge = 1000*60*60*6;
//cache 6 hours, by default
var hour = 60*60;
exports.maxAge = settings.maxAge || 6 * hour;
//set loglevel
log4js.setGlobalLogLevel(settings.loglevel);