libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

Restored the errorlog function, fixes a bug

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-05-19 22:22:12 +01:00
parent eadc8fcf3b
commit 42dfb31cf8
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
node/server.js
View file

@ -16,8 +16,6 @@
require('joose'); require('joose');
//var http = require('http')
//var url = require('url')
var socketio = require('socket.io') var socketio = require('socket.io')
var settings = require('./settings') var settings = require('./settings')
var db = require('./db') var db = require('./db')
@ -120,6 +118,24 @@ async.waterfall([
} }
]); ]);
function errorlog(e)
{
var timeStr = new Date().toUTCString() + ": ";
if(typeof e == "string")
{
console.error(timeStr + e);
}
else if(e.stack != null)
{
console.error(timeStr + e.stack);
}
else
{
console.error(timeStr + JSON.stringify(e));
}
}
function randomPadName() function randomPadName()
{ {
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz"; var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";