Remove pack array support. Closes #1652

hapijs · May 25, 2014 · 6c20786 · 6c20786
1 parent 89f90dd
commit 6c20786
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 49 deletions.
diff --git a/lib/composer.js b/lib/composer.js
@@ -10,7 +10,7 @@ var Pack = require('./pack');
 var internals = {};
 
 /*
-var config = [{
+var config = {
     pack: {
         cache: 'redis',
         app: {
@@ -38,77 +38,59 @@ var config = [{
             plugins: '/'
         }
     }
-}];
+};
 */
 
 exports = module.exports = internals.Composer = function (manifest, options) {
 
-    this._manifest = Hoek.clone([].concat(manifest));
+    this._manifest = Hoek.clone(manifest);
     this._settings = Hoek.clone(options || {});
-    this._packs = [];
+    this._pack = null;
 };
 
 
 internals.Composer.prototype.compose = function (callback) {
 
     var self = this;
 
-    // Create packs
-
-    var sets = [];
-    this._manifest.forEach(function (set) {
+    // Create pack
 
-        Hoek.assert(set.servers && set.servers.length, 'Pack missing servers definition');
-        Hoek.assert(set.plugins, 'Pack missing plugins definition');
+    var set = this._manifest;
 
-        var pack = new Pack(Hoek.applyToDefaults(self._settings.pack || {}, set.pack || {}));
+    Hoek.assert(set.servers && set.servers.length, 'Pack missing servers definition');
+    Hoek.assert(set.plugins, 'Pack missing plugins definition');
 
-        // Load servers
+    this._pack = new Pack(Hoek.applyToDefaults(self._settings.pack || {}, set.pack || {}));
 
-        set.servers.forEach(function (server) {
+    // Load servers
 
-            if (server.host &&
-                server.host.indexOf('$env.') === 0) {
+    set.servers.forEach(function (server) {
 
-                server.host = process.env[server.host.slice(5)];
-            }
+        if (server.host &&
+            server.host.indexOf('$env.') === 0) {
 
-            if (server.port &&
-                typeof server.port === 'string' &&
-                server.port.indexOf('$env.') === 0) {
+            server.host = process.env[server.host.slice(5)];
+        }
 
-                server.port = parseInt(process.env[server.port.slice(5)], 10);
-            }
+        if (server.port &&
+            typeof server.port === 'string' &&
+            server.port.indexOf('$env.') === 0) {
 
-            pack.server(server.host, server.port, server.options);
-        });
+            server.port = parseInt(process.env[server.port.slice(5)], 10);
+        }
 
-        sets.push({ pack: pack, plugins: set.plugins });
-        self._packs.push(pack);
+        self._pack.server(server.host, server.port, server.options);
     });
 
-    // Register plugins
-
-    Async.forEachSeries(sets, function (set, next) {
-
-        set.pack.require(set.plugins, next);
-    },
-    function (err) {
-
-        return callback(err);
-    });
+    this._pack.require(set.plugins, callback);
 };
 
 
 internals.Composer.prototype.start = function (callback) {
 
     callback = callback || Hoek.ignore;
 
-    Async.forEachSeries(this._packs, function (pack, next) {
-
-        pack.start(next);
-    },
-    function (err) {
+    this._pack.start(function (err) {
 
         Hoek.assert(!err, 'Failed starting plugins:', err && err.message);
         return callback();
@@ -125,9 +107,5 @@ internals.Composer.prototype.stop = function (options, callback) {
 
     callback = callback || Hoek.ignore;
 
-    Async.forEach(this._packs, function (pack, next) {
-
-        pack.stop(options, next);
-    },
-    callback);
+    this._pack.stop(options, callback);
 };
diff --git a/test/composer.js b/test/composer.js
@@ -60,7 +60,7 @@ describe('Composer', function () {
                 expect(err).to.not.exist;
                 composer.stop(function () {
 
-                    composer._packs[0]._servers[0].inject({ method: 'GET', url: '/test1' }, function (res) {
+                    composer._pack._servers[0].inject({ method: 'GET', url: '/test1' }, function (res) {
 
                         expect(res.result).to.equal('testing123special-value');
                         done();
@@ -110,7 +110,7 @@ describe('Composer', function () {
                 expect(err).to.not.exist;
                 composer.stop();
 
-                composer._packs[0]._servers[0].inject({ method: 'GET', url: '/test1' }, function (res) {
+                composer._pack._servers[0].inject({ method: 'GET', url: '/test1' }, function (res) {
 
                     expect(res.result).to.equal('testing123');
                     done();
@@ -162,7 +162,7 @@ describe('Composer', function () {
 
             expect(err).to.not.exist;
 
-            expect(composer._packs[0].app).to.equal('only here');
+            expect(composer._pack.app).to.equal('only here');
             done();
         });
     });