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

checked to make sure init is passed a function

Browse source
This commit is contained in:
Montana Scott Rowe 2012-01-19 17:36:56 -06:00
parent 7e522eaf85
commit a7d9e6b9a3
1 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
node/server.js
View file

@ -451,6 +451,8 @@ function gotoPadCombinator(checkPadName, padManager){
}
function init(additionalSetup){
if("function" != typeof additionalSetup)
additionalSetup = function(){};
async.waterfall([
//initalize the database
setupDb,
@ -485,6 +487,7 @@ function init(additionalSetup){
var httpLogger = log4js.getLogger("http");
var apiLogger = log4js.getLogger("API");
//checks for padAccess
function hasPadAccess(req, res, callback)
{
@ -561,27 +564,28 @@ function init(additionalSetup){
};
var posts = {
//handle import requests
'/p/:pad/import': postImportPadCombinator(goToPad, settings, serverName, hasPadAccess, importHandler)
//This is a api POST call, collect all post informations and pass it to the apiHandler
'/api/1/:func': function(req, res)
{
new formidable.IncomingForm().parse(req, function(err, fields, files)
'/p/:pad/import': postImportPadCombinator(
goToPad, settings, serverName, hasPadAccess, importHandler
),
'/api/1/:func': function(req, res){
new formidable.IncomingForm().parse(
req,
function(err, fields, files)
{
apiCaller(req, res, fields)
});
},
//The Etherpad client side sends information about how a disconnect happen
'/ep/pad/connection-diagnostic-info': logOkPostCombinator("DIAGNOSTIC-INFO", "log", "diagnosticInfo"),
//The Etherpad client side sends information about client side javscript errors
'/jserror': logOkPostCombinator("CLIENT SIDE JAVASCRIPT ERROR", "error", "errorInfo")
'/ep/pad/connection-diagnostic-info': logOkPostCombinator(
"DIAGNOSTIC-INFO", "log", "diagnosticInfo"
),
'/jserror': logOkPostCombinator(
"CLIENT SIDE JAVASCRIPT ERROR", "error", "errorInfo"
)
};
additionalSetup(app, gets, posts);
additionalSetup(app, gets, posts, managers, handlers, db);
for(var key in gets) app.get(key, gets[key]);
@ -602,4 +606,4 @@ function init(additionalSetup){
}
this.init = init;
init(function(app, gets, posts){});
init(function(app, gets, posts, managers, handlers, db){});