From 853cea7fec0a67dc18f937f971d9871cc7a9a197 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 18 Nov 2016 15:03:50 +0300 Subject: [PATCH] removed emitter.js --- src/emitter.js | 35 ----------------------------------- src/plugins.js | 2 -- src/socket.io/meta.js | 8 -------- src/webserver.js | 8 ++++++-- 4 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 src/emitter.js diff --git a/src/emitter.js b/src/emitter.js deleted file mode 100644 index ca262257b7..0000000000 --- a/src/emitter.js +++ /dev/null @@ -1,35 +0,0 @@ -"use strict"; - -var eventEmitter = new (require('events')).EventEmitter(); - - -eventEmitter.all = function (events, callback) { - var eventList = events.slice(0); - - events.forEach(function onEvent(event) { - eventEmitter.on(event, function () { - var index = eventList.indexOf(event); - if (index === -1) { - return; - } - eventList.splice(index, 1); - if (eventList.length === 0) { - callback(); - } - }); - }); -}; - -eventEmitter.any = function (events, callback) { - events.forEach(function onEvent(event) { - eventEmitter.on(event, function () { - if (events !== null) { - callback(); - } - - events = null; - }); - }); -}; - -module.exports = eventEmitter; \ No newline at end of file diff --git a/src/plugins.js b/src/plugins.js index 1a20597564..0f9348f9f3 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -9,7 +9,6 @@ var express = require('express'); var nconf = require('nconf'); var db = require('./database'); -var emitter = require('./emitter'); var utils = require('../public/src/utils'); var hotswap = require('./hotswap'); var file = require('./file'); @@ -69,7 +68,6 @@ var middleware; } Plugins.initialized = true; - emitter.emit('plugins:loaded'); callback(); }); }; diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index 35a5da17e1..5714f24080 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -3,7 +3,6 @@ var meta = require('../meta'); var user = require('../user'); var topics = require('../topics'); -var emitter = require('../emitter'); var websockets = require('./'); @@ -18,13 +17,6 @@ SocketMeta.reconnected = function (socket, data, callback) { } }; -emitter.on('nodebb:ready', function () { - websockets.server.emit('event:nodebb.ready', { - 'cache-buster': meta.config['cache-buster'] - }); -}); - - /* Rooms */ SocketMeta.rooms.enter = function (socket, data, callback) { diff --git a/src/webserver.js b/src/webserver.js index 964ae60bfd..fec42974c6 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -26,7 +26,6 @@ var logger = require('./logger'); var plugins = require('./plugins'); var routes = require('./routes'); var auth = require('./routes/authentication'); -var emitter = require('./emitter'); var templates = require('templates.js'); var helpers = require('../public/src/modules/helpers'); @@ -68,7 +67,12 @@ module.exports.listen = function (callback) { } winston.info('NodeBB Ready'); - emitter.emit('nodebb:ready'); + + require('./socket.io').server.emit('event:nodebb.ready', { + 'cache-buster': meta.config['cache-buster'] + }); + + plugins.fireHook('action:nodebb.ready'); listen(callback); });