mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 16:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Installed log4js as logging framework

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-07-31 18:25:51 +01:00
parent 22b00264d8
commit b30849c2f2
7 changed files with 41 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
node/handler/PadMessageHandler.js
View file

@ -319,11 +319,6 @@ function handleUserInfoUpdate(client, message)
}
}
function errlog(name, value)
{
console.error(name+"=" + JSON.stringify(value));
}
/**
* Handles a USERINFO_UPDATE, that means that a user have changed his color or name. Anyway, we get both informations
* This Method is nearly 90% copied out of the Etherpad Source Code. So I can't tell you what happens here exactly
@ -418,7 +413,7 @@ function handleUserChanges(client, message)
if (Changeset.oldLen(changeset) != prevText.length)
{
console.log("Can't apply USER_CHANGES "+changeset+" with oldLen " + Changeset.oldLen(changeset) + " to document of length " + prevText.length);
console.warn("Can't apply USER_CHANGES "+changeset+" with oldLen " + Changeset.oldLen(changeset) + " to document of length " + prevText.length);
client.json.send({disconnect:"badChangeset"});
callback();
return;

11
node/handler/SocketIORouter.js
View file

@ -19,6 +19,9 @@
* limitations under the License.
*/
var log4js = require('log4js');
var messageLogger = log4js.getLogger("message");
/**
* Saves all components
* key is the component name
@ -54,7 +57,7 @@ exports.setSocketIO = function(_socket)
client._send = client.send;
client.send = function(message)
{
console.log(new Date().toUTCString() + ": message to " + client.id + ": " + JSON.stringify(message));
messageLogger.info("to " + client.id + ": " + JSON.stringify(message));
client._send(message);
}
@ -68,14 +71,14 @@ exports.setSocketIO = function(_socket)
{
if(message.protocolVersion && message.protocolVersion != 2)
{
console.error("Protocolversion header is not correct:" + JSON.stringify(message));
messageLogger.warn("Protocolversion header is not correct:" + JSON.stringify(message));
return;
}
//route this message to the correct component, if possible
if(message.component && components[message.component])
{
console.log(new Date().toUTCString() + ": message from " + client.id + ": " + JSON.stringify(message));
messageLogger.info("from " + client.id + ": " + JSON.stringify(message));
//check if component is registered in the components array
if(components[message.component])
@ -85,7 +88,7 @@ exports.setSocketIO = function(_socket)
}
else
{
console.error("Can't route the message:" + JSON.stringify(message));
messageLogger.error("Can't route the message:" + JSON.stringify(message));
}
});