Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-18 11:41:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:designcreateplay/NodeBB

Browse Source
This commit is contained in:
Julian Lam
2014-03-17 13:20:29 -04:00
parent 0459e242fc 6e64712fd3
commit d30acee9d3
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/emitter.js Normal file
View File

@@ -0,0 +1,4 @@
var events = require('events'),
eventEmitter = new events.EventEmitter();
module.exports = eventEmitter;

3
src/middleware/index.js
View File

@@ -7,6 +7,8 @@ var templates = require('./../../public/src/templates'),
plugins = require('./../plugins'),
db = require('./../database'),
auth = require('./../routes/authentication'),
emitter = require('./../emitter'),
async = require('async'),
path = require('path'),
fs = require('fs'),
@@ -119,6 +121,7 @@ function compileTemplates(pluginTemplates) {
if (err) {
winston.error(err);
} else {
emitter.emit('templates:compiled');
winston.info('[themes] Successfully compiled templates.');
}
});

2
src/routes/index.js
View File

@@ -30,7 +30,7 @@ function mainRoutes(app, middleware, controllers) {
app.get('/api/outgoing', controllers.outgoing);
app.get('/search/:term?', middleware.buildHeader, middleware.guestSearchingAllowed, controllers.search);
app.get('/api/search/:term', middleware.guestSearchingAllowed, controllers.search);
app.get('/api/search/:term?', middleware.guestSearchingAllowed, controllers.search);
app.get('/reset/:code?', middleware.buildHeader, controllers.reset);
app.get('/api/reset/:code?', controllers.reset);

5
src/webserver.js
View File

@@ -14,7 +14,8 @@ var path = require('path'),
meta = require('./meta'),
logger = require('./logger'),
middleware = require('./middleware'),
routes = require('./routes');
routes = require('./routes'),
emitter = require('./emitter');
if(nconf.get('ssl')) {
server = require('https').createServer({
@@ -92,10 +93,12 @@ if(nconf.get('ssl')) {
}
});
emitter.on('templates:compiled', function() {
winston.info('NodeBB attempting to listen on: ' + ((nconf.get('bind_address') === "0.0.0.0" || !nconf.get('bind_address')) ? '0.0.0.0' : nconf.get('bind_address')) + ':' + port);
server.listen(port, nconf.get('bind_address'), function(){
winston.info('NodeBB Ready');
});
});
};
}(WebServer));