Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-20 18:18:56 +00:00
Code Issues Projects Releases Wiki Activity

feature(express) add join as express middleware

Browse source
This commit is contained in:
coderaiser 2014-02-10 05:00:20 -05:00
parent bbfff3c704
commit 881ce04f4b
2 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/server.js
View file

@ -97,7 +97,11 @@
},
lHTTPServer = function() {
expressApp = express.getApp(controller);
expressApp = express.getApp([
join,
controller
]);
Server = http.createServer(expressApp || controller);
Server.on('error', Util.log.bind(Util));
@ -183,10 +187,8 @@
if (!lRet && Route)
lRet = Util.exec(Route, data);
if (!lRet)
lRet = join(pReq, pRes, function(error) {
main.sendError(data, error);
});
if (!lRet && !expressApp)
lRet = join(pReq, pRes);
if (!lRet) {
lName = data.name;
@ -263,7 +265,11 @@
if (error)
if (!response.headersSent)
Util.exec(callback, error);
main.sendError({
request : request,
response : response,
name : path
}, error);
else {
Util.log(error);
errorStr = error.toString();
@ -304,7 +310,8 @@
}
Util.asyncCall(funcs, readPipe);
}
}
} else
Util.exec(callback);
return isJoin;
}

14
lib/server/express.js
View file

@ -18,8 +18,9 @@
oldName,
app = express && express();
exports.getApp = function(controller) {
var config = main.config,
exports.getApp = function(middleware) {
var i, n, middle,
config = main.config,
auth = config.auth;
if (app) {
@ -30,7 +31,14 @@
app.use(httpAuth.connect(basic));
}
app.all('*', controller);
if (middleware) {
n = middleware.length;
for (i = 0; i < n; i++) {
middle = middleware[i];
app.use(middle);
}
}
}
return app;