libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/holtzermann17/etherpad-lite

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-11-19 11:58:33 -08:00
commit 0123fa0838
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
node/handler/PadMessageHandler.js
View file

@ -136,7 +136,7 @@ exports.handleDisconnect = function(client)
{
if(pad2sessions[sessionPad][i] == client.id)
{
pad2sessions[sessionPad].splice(i, 1);
delete pad2sessions[sessionPad][i];
break;
}
}
@ -190,10 +190,10 @@ exports.handleMessage = function(client, message)
{
handleSuggestUserName(client, message);
}
//if the message type is unkown, throw an exception
//if the message type is unknown, throw an exception
else
{
messageLogger.warn("Dropped message, unkown Message Type " + message.type + ": " + JSON.stringify(message));
messageLogger.warn("Dropped message, unknown Message Type " + message.type);
}
}
@ -600,22 +600,22 @@ function handleClientReady(client, message)
//check if all ok
if(!message.token)
{
messageLogger.warn("Dropped message, CLIENT_READY message has no token!");
messageLogger.warn("Dropped message, CLIENT_READY Message has no token!");
return;
}
if(!message.padId)
{
messageLogger.warn("Dropped message, CLIENT_READY message has no padId!");
messageLogger.warn("Dropped message, CLIENT_READY Message has no padId!");
return;
}
if(!message.protocolVersion)
{
messageLogger.warn("Dropped message, CLIENT_READY message has no protocolVersion!");
messageLogger.warn("Dropped message, CLIENT_READY Message has no protocolVersion!");
return;
}
if(message.protocolVersion != 2)
{
messageLogger.warn("Dropped message, CLIENT_READY message has an unkown protocolVersion '" + message.protocolVersion + "'!");
messageLogger.warn("Dropped message, CLIENT_READY Message has a unknown protocolVersion '" + message.protocolVersion + "'!");
return;
}

2
node/handler/SocketIORouter.js
View file

@ -128,7 +128,7 @@ exports.setSocketIO = function(_socket)
//drop message
else
{
messageLogger.warn("Droped message cause of bad permissions:" + stringifyWithoutPassword(message));
messageLogger.warn("Dropped message cause of bad permissions:" + stringifyWithoutPassword(message));
}
}
});

2
node/handler/TimesliderMessageHandler.js
View file

@ -77,7 +77,7 @@ exports.handleMessage = function(client, message)
//if the message type is unkown, throw an exception
else
{
messageLogger.warn("Dropped message, unkown Message Type: '" + message.type + "'");
messageLogger.warn("Dropped message, unknown Message Type: '" + message.type + "'");
}
}