mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-10 08:55:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Prepared logging code to be able to read log4js appenders from settings.json

Browse source
This commit is contained in:
Uli Köhler 2012-09-29 23:26:58 +02:00
parent 970f3b181d
commit a479fa144e
11 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/node/hooks/express/apicalls.js
View file

@ -1,9 +1,12 @@
var log4js = require('log4js');
log4js.configure('etherpad_logging.json');
var settings = require('../../utils/Settings');
var apiLogger = log4js.getLogger("API");
var formidable = require('formidable');
var apiHandler = require('../../handler/APIHandler');
//Configure the logging appenders
log4js.configure(settings.logconfig);
//This is for making an api call, collecting all post information and passing it to the apiHandler
var apiCaller = function(req, res, fields) {
res.header("Content-Type", "application/json; charset=utf-8");

7
src/node/hooks/express/socketio.js
View file

@ -1,9 +1,12 @@
var log4js = require('log4js');
log4js.configure('etherpad_logging.json');
var socketio = require('socket.io');
var settings = require('../../utils/Settings');
var settings = require('../../utils/Settings.js');
var socketIORouter = require("../../handler/SocketIORouter");
var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
console.dir("adgadgqadgaegaega");
//Configure the logging appenders
log4js.configure(settings.logconfig);
var padMessageHandler = require("../../handler/PadMessageHandler");

3
src/node/hooks/express/webaccess.js
View file

@ -1,11 +1,12 @@
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;
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
//Configure the logging appenders
log4js.configure(settings.logconfig);
//checks for basic http auth
exports.basicAuth = function (req, res, next) {