diff options
| author | Matthias Bartelmeß <mba@fourplusone.de> | 2012-03-23 19:28:46 +0100 |
|---|---|---|
| committer | Matthias Bartelmeß <mba@fourplusone.de> | 2012-03-23 19:28:46 +0100 |
| commit | c407ad3d3499ab1142b740fb0c6163be68e5dfe3 (patch) | |
| tree | 0e90a985b5c12c0eb7425549e256f42b96b989d5 /src/node | |
| parent | cccd8a923cfa21c7e248a2a5fcffa54caf512e0b (diff) | |
| download | etherpad-lite-c407ad3d3499ab1142b740fb0c6163be68e5dfe3.zip | |
re-enabled maxAge setting. maxAge is now in seconds, not milliseconds.
Diffstat (limited to 'src/node')
| -rw-r--r-- | src/node/server.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/node/server.js b/src/node/server.js index 19df6e72..8e6d6fa0 100644 --- a/src/node/server.js +++ b/src/node/server.js @@ -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); |