From caf125a798f7385bb49fe125371daa6b21376379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uli=20K=C3=B6hler?= <ulrich.koehler@helmholtz-muenchen.de>
Date: Thu, 20 Sep 2012 09:40:41 +0200
Subject: [PATCH] Added user-configurable logging defaulting to console logging

---
 bin/extractPadData.js                 | 2 +-
 etherpad_logging.json                 | 3 +++
 src/node/db/DB.js                     | 1 +
 src/node/handler/PadMessageHandler.js | 1 +
 src/node/handler/SocketIORouter.js    | 1 +
 src/node/hooks/express/apicalls.js    | 1 +
 src/node/hooks/express/socketio.js    | 1 +
 src/node/hooks/express/webaccess.js   | 1 +
 src/node/server.js                    | 1 +
 src/node/utils/ImportHtml.js          | 1 +
 10 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 etherpad_logging.json

diff --git a/bin/extractPadData.js b/bin/extractPadData.js
index 061a2e3f9..dfe92f630 100644
--- a/bin/extractPadData.js
+++ b/bin/extractPadData.js
@@ -11,7 +11,7 @@ if(process.argv.length != 3)
 var padId = process.argv[2];
 
 //initalize the database
-var log4js = require("log4js");
+var log4js = require("log4js").configure('etherpad_logging.json');
 log4js.setGlobalLogLevel("INFO");
 var async = require("async");
 var db = require('../node/db/DB');
diff --git a/etherpad_logging.json b/etherpad_logging.json
new file mode 100644
index 000000000..fe634940f
--- /dev/null
+++ b/etherpad_logging.json
@@ -0,0 +1,3 @@
+{ "appenders": [
+    { "type": "console" }
+] }
diff --git a/src/node/db/DB.js b/src/node/db/DB.js
index 7273c83e3..b52a39d28 100644
--- a/src/node/db/DB.js
+++ b/src/node/db/DB.js
@@ -22,6 +22,7 @@
 var ueberDB = require("ueberDB");
 var settings = require("../utils/Settings");
 var log4js = require('log4js');
+log4js.configure('etherpad_logging.json');
 
 //set database settings
 var db = new ueberDB.database(settings.dbType, settings.dbSettings, null, log4js.getLogger("ueberDB"));
diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 913433b01..aa0d591da 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -31,6 +31,7 @@ var settings = require('../utils/Settings');
 var securityManager = require("../db/SecurityManager");
 var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins.js");
 var log4js = require('log4js');
+log4js.configure('etherpad_logging.json');
 var messageLogger = log4js.getLogger("message");
 var _ = require('underscore');
 var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks.js");
diff --git a/src/node/handler/SocketIORouter.js b/src/node/handler/SocketIORouter.js
index f3b82b8c7..bf3023105 100644
--- a/src/node/handler/SocketIORouter.js
+++ b/src/node/handler/SocketIORouter.js
@@ -21,6 +21,7 @@
 
 var ERR = require("async-stacktrace");
 var log4js = require('log4js');
+log4js.configure('etherpad_logging.json');
 var messageLogger = log4js.getLogger("message");
 var securityManager = require("../db/SecurityManager");
 
diff --git a/src/node/hooks/express/apicalls.js b/src/node/hooks/express/apicalls.js
index e57e1d350..d8f1a2116 100644
--- a/src/node/hooks/express/apicalls.js
+++ b/src/node/hooks/express/apicalls.js
@@ -1,4 +1,5 @@
 var log4js = require('log4js');
+log4js.configure('etherpad_logging.json');
 var apiLogger = log4js.getLogger("API");
 var formidable = require('formidable');
 var apiHandler = require('../../handler/APIHandler');
diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js
index 4f780cb0b..9a2eb3353 100644
--- a/src/node/hooks/express/socketio.js
+++ b/src/node/hooks/express/socketio.js
@@ -1,4 +1,5 @@
 var log4js = require('log4js');
+log4js.configure('etherpad_logging.json');
 var socketio = require('socket.io');
 var settings = require('../../utils/Settings');
 var socketIORouter = require("../../handler/SocketIORouter");
diff --git a/src/node/hooks/express/webaccess.js b/src/node/hooks/express/webaccess.js
index ffced0476..5ff05807f 100644
--- a/src/node/hooks/express/webaccess.js
+++ b/src/node/hooks/express/webaccess.js
@@ -1,5 +1,6 @@
 var express = require('express');
 var log4js = require('log4js');
+log4js.configure('etherpad_logging.json');
 var httpLogger = log4js.getLogger("http");
 var settings = require('../../utils/Settings');
 var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
diff --git a/src/node/server.js b/src/node/server.js
index cca76c1f9..4fae93022 100755
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -22,6 +22,7 @@
  */
 
 var log4js = require('log4js');
+log4js.configure('etherpad_logging.json');
 var settings = require('./utils/Settings');
 var db = require('./db/DB');
 var async = require('async');
diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js
index 7c638fb8c..7afe24aff 100644
--- a/src/node/utils/ImportHtml.js
+++ b/src/node/utils/ImportHtml.js
@@ -16,6 +16,7 @@
 
 var jsdom = require('jsdom-nocontextifiy').jsdom;
 var log4js = require('log4js');
+log4js.configure('etherpad_logging.json');
 
 
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");