Added user-configurable logging defaulting to console logging

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');

etherpad_logging.json

@@ -0,0 +1,3 @@
+{ "appenders": [
+    { "type": "console" }
+] }

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"));

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");

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");
 

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');

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");

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;

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');

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");