Upgrade log4js to v0.5

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

View file

@ -95,6 +95,7 @@ exports.expressConfigure = function (hook_name, args, cb) {
// Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway.
if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR"))
args.app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'}));
args.app.use(express.cookieParser());
/* Do not let express create the session, so that we can retain a

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)

View file

@ -22,7 +22,7 @@
"clean-css" : "0.3.2",
"uglify-js" : "1.2.5",
"formidable" : "1.0.9",
"log4js" : "0.4.1",
"log4js" : "0.5.x",
"jsdom-nocontextifiy" : "0.2.10",
"async-stacktrace" : "0.0.2",
"npm" : "1.1.24",