From ff7cf991c9f6bb6b7d1c9f9d1bd0963050170bb8 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Fri, 21 Sep 2012 21:39:08 +0200
Subject: [PATCH] Upgrade log4js to v0.5

---
 src/node/hooks/express/webaccess.js |  1 +
 src/node/server.js                  | 10 +++++++---
 src/package.json                    |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/node/hooks/express/webaccess.js b/src/node/hooks/express/webaccess.js
index ffced0476..a6a270c02 100644
--- a/src/node/hooks/express/webaccess.js
+++ b/src/node/hooks/express/webaccess.js
@@ -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
diff --git a/src/node/server.js b/src/node/server.js
index cca76c1f9..b91b0e17c 100755
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -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)
diff --git a/src/package.json b/src/package.json
index a7550faed..bee732058 100644
--- a/src/package.json
+++ b/src/package.json
@@ -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",