Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-23 17:00:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

moved action:app.load out of webserver; passing in app, mdw, and controllers into action:app.load. now we can create routes dynamically ;)

Browse Source
This commit is contained in:
psychobunny
2014-03-06 14:09:10 -05:00
parent a9cccc9b9c
commit 178edd150a
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/routes/index.js
View File

@@ -3,8 +3,8 @@
var nconf = require('nconf'), var nconf = require('nconf'),
controllers = require('./../controllers'), controllers = require('./../controllers'),
meta = require('./../meta'), meta = require('./../meta'),
plugins = require('./../plugins'), plugins = require('./../plugins'),
metaRoutes = require('./meta'), metaRoutes = require('./meta'),
apiRoutes = require('./api'), apiRoutes = require('./api'),
adminRoutes = require('./admin'), adminRoutes = require('./admin'),
@@ -122,6 +122,7 @@ module.exports = function(app, middleware) {
app.get('/api/users/search', middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch); app.get('/api/users/search', middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch);
pluginRoutes(app, middleware, controllers); pluginRoutes(app, middleware, controllers);
plugins.fireHook('action:app.load', app, middleware, controllers);
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
require('./debug')(app, middleware, controllers); require('./debug')(app, middleware, controllers);

18
src/routes/plugins.js
View File

@@ -22,7 +22,7 @@ function setupPluginRoutes(app) {
/* /*
* TO BE DEPRECATED post 0.4x and replaced with something that isn't as complicated as this... * TO BE DEPRECATED post 0.4x and replaced with something that isn't as complicated as this...
*/ */
plugins.fireHook('filter:server.create_routes', custom_routes, function(err, custom_routes) { /*plugins.fireHook('filter:server.create_routes', custom_routes, function(err, custom_routes) {
var route, var route,
routes = custom_routes.routes; routes = custom_routes.routes;
@@ -33,12 +33,12 @@ function setupPluginRoutes(app) {
(function(route) { (function(route) {
app[routes[route].method || 'get'](routes[route].route, function(req, res) { app[routes[route].method || 'get'](routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) { routes[route].options(req, res, function(options) {
/*app.build_header({ app.build_header({
req: options.req || req, req: options.req || req,
res: options.res || res res: options.res || res
}, function (err, header) { }, function (err, header) {
//res.send(header + options.content + templates.footer); //res.send(header + options.content + templates.footer);
});*/ });
}); });
}); });
}(route)); }(route));
@@ -68,7 +68,7 @@ function setupPluginRoutes(app) {
}(route)); }(route));
} }
} }
}); });*/
}); });
} }
@@ -82,7 +82,7 @@ function setupPluginAdminRoutes(app) {
/* /*
* TO BE DEPRECATED post 0.4x and replaced with something that isn't as complicated as this... * TO BE DEPRECATED post 0.4x and replaced with something that isn't as complicated as this...
*/ */
plugins.fireHook('filter:admin.create_routes', custom_routes, function(err, custom_routes) { /*plugins.fireHook('filter:admin.create_routes', custom_routes, function(err, custom_routes) {
var route, routes = custom_routes.routes; var route, routes = custom_routes.routes;
for (route in routes) { for (route in routes) {
@@ -90,9 +90,9 @@ function setupPluginAdminRoutes(app) {
(function(route) { (function(route) {
app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) { app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) { routes[route].options(req, res, function(options) {
//Admin.buildHeader(req, res, function (err, header) { Admin.buildHeader(req, res, function (err, header) {
//res.send(header + options.content + templates['admin/footer']); res.send(header + options.content + templates['admin/footer']);
//}); });
}); });
}); });
}(route)); }(route));
@@ -111,7 +111,7 @@ function setupPluginAdminRoutes(app) {
}(route)); }(route));
} }
} }
}); });*/
}); });
} }

3
src/webserver.js
View File

@@ -11,7 +11,6 @@ var path = require('path'),
db = require('./database'), db = require('./database'),
auth = require('./routes/authentication'), auth = require('./routes/authentication'),
meta = require('./meta'), meta = require('./meta'),
plugins = require('./plugins'),
logger = require('./logger'), logger = require('./logger'),
middleware = require('./middleware'), middleware = require('./middleware'),
routes = require('./routes'); routes = require('./routes');
@@ -82,8 +81,6 @@ if(nconf.get('ssl')) {
module.exports.server = server; module.exports.server = server;
module.exports.init = function () { module.exports.init = function () {
plugins.fireHook('action:app.load', app);
server.on("error", function(err){ server.on("error", function(err){
if (err.code === 'EADDRINUSE') { if (err.code === 'EADDRINUSE') {
winston.error('NodeBB address in use, exiting...'); winston.error('NodeBB address in use, exiting...');