libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

added a loglevel setting

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-17 17:45:47 +01:00
parent 77ba4e3e6c
commit 3ec7dc224b
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
node/server.js
View file

@ -60,6 +60,9 @@ var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";
//cache 6 hours //cache 6 hours
exports.maxAge = 1000*60*60*6; exports.maxAge = 1000*60*60*6;
//set loglevel
log4js.setGlobalLogLevel(settings.loglevel);
async.waterfall([ async.waterfall([
//initalize the database //initalize the database
function (callback) function (callback)

5
node/utils/Settings.js
View file

@ -52,6 +52,11 @@ exports.minify = true;
*/ */
exports.abiword = null; exports.abiword = null;
/**
* The log level of log4js
*/
exports.loglevel = "INFO";
//read the settings sync //read the settings sync
var settingsStr = fs.readFileSync("../settings.json").toString(); var settingsStr = fs.readFileSync("../settings.json").toString();

5
settings.json.template
View file

@ -34,5 +34,8 @@
/* This is the path to the Abiword executable. Setting it to null, disables abiword. /* This is the path to the Abiword executable. Setting it to null, disables abiword.
Abiword is needed to enable the import/export of pads*/ Abiword is needed to enable the import/export of pads*/
"abiword" : null "abiword" : null,
/* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */
"loglevel": "INFO"
} }