Refactor boots trappers. Add event bus for modules.

catberry · Mar 26, 2014 · a54420f · a54420f
1 parent 75f1b01
commit a54420f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/lib/BootstrapperBase.js b/lib/BootstrapperBase.js
@@ -34,6 +34,7 @@ module.exports = BootstrapperBase;
 
 var path = require('path'),
 	util = require('util'),
+	EventEmitter = require('events').EventEmitter,
 	configPath = path.join(process.cwd(), 'config.json'),
 	config,
 	ServiceLocator = require('./ServiceLocator');
@@ -88,9 +89,14 @@ BootstrapperBase.prototype.create = function (configObject) {
 
 /**
  * Configures locator with all required type registrations.
- * @param {Object} currentConfig Configuration object.
+ * @param {Object} configObject Configuration object.
  * @param {ServiceLocator} locator Service locator to configure.
  */
-BootstrapperBase.prototype.configure = function (currentConfig, locator) {
+BootstrapperBase.prototype.configure = function (configObject, locator) {
+	var eventBus = new EventEmitter();
+	eventBus.setMaxListeners(0);
+	locator.registerInstance('eventBus', eventBus);
+
+	locator.registerInstance('config', configObject);
 
 };
diff --git a/lib/client/Bootstrapper.js b/lib/client/Bootstrapper.js
@@ -71,9 +71,9 @@ function Bootstrapper() {
  * @param {ServiceLocator} locator Service locator to configure.
  */
 Bootstrapper.prototype.configure = function (configObject, locator) {
+	BootstrapperBase.prototype.configure.call(this, configObject, locator);
 	var loggerConfig = configObject.logger || {};
 	locator.registerInstance('logger', new Logger(loggerConfig.levels));
-	locator.registerInstance('config', configObject);
 	locator.registerInstance('window', window);
 
 	locator.register('moduleLoader', ModuleLoader, configObject, true);

diff --git a/lib/server/Bootstrapper.js b/lib/server/Bootstrapper.js
@@ -53,6 +53,7 @@ function Bootstrapper() {
  * @param {ServiceLocator} locator Service locator to configure.
  */
 Bootstrapper.prototype.configure = function (configObject, locator) {
+	BootstrapperBase.prototype.configure.call(this, configObject, locator);
 	if (!configObject.clientTemplateEnginePath) {
 		configObject.clientTemplateEnginePath = path.relative(
 			path.join(__dirname, '..', 'client'),
@@ -71,8 +72,8 @@ Bootstrapper.prototype.configure = function (configObject, locator) {
 		require('./TemplateProvider'), configObject, true);
 	locator.register('clientBundleBuilder',
 		require('./ClientBundleBuilder'), configObject, true);
+
 	locator.registerInstance('logger', Log4js.getLogger('catberry'));
-	locator.registerInstance('config', configObject);
 };
 
 module.exports = new Bootstrapper();