mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-06-17 11:44:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Upgrade log4js to v0.5

Browse source
This commit is contained in:
Marcel Klehr 2012-09-21 21:39:08 +02:00
parent 4416210471
commit ff7cf991c9
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/node/server.js
View file

@ -21,8 +21,15 @@
* limitations under the License.
*/
// set up logger
var log4js = require('log4js');
log4js.replaceConsole();
var settings = require('./utils/Settings');
//set loglevel
log4js.setGlobalLogLevel(settings.loglevel);
var db = require('./db/DB');
var async = require('async');
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
@ -31,9 +38,6 @@ var npm = require("npm/lib/npm.js");
hooks.plugins = plugins;
//set loglevel
log4js.setGlobalLogLevel(settings.loglevel);
async.waterfall([
//initalize the database
function (callback)