Improve the restart process on instances

lib/configuration/hooks/_config/index.js

@@ -128,9 +128,9 @@ module.exports = function (strapi) {
         strapi.controllers = {};
         strapi.models = {};
         strapi.policies = {};
-      });
 
         cb();
+      });
     },
 
     /**

lib/configuration/hooks/router/index.js

@@ -4,6 +4,9 @@
  * Module dependencies
  */
 
+// Node.js core.
+const cluster = require('cluster');
+
 // Public node modules.
 const _ = require('lodash');
 
@@ -36,6 +39,7 @@ module.exports = function (strapi) {
      */
 
     initialize: function (cb) {
+      if ((cluster.isWorker && strapi.config.reload.workers > 0) || (cluster.isMaster && strapi.config.reload.workers < 1)) {
         let route;
         let controller;
         let action;
@@ -139,6 +143,7 @@ module.exports = function (strapi) {
             this.app.emit('error', err, this);
           }
         });
+      }
 
       cb();
     },
@@ -148,6 +153,8 @@ module.exports = function (strapi) {
      */
 
     reload: function () {
+      delete strapi.router;
+
       hook.initialize(function (err) {
         if (err) {
           strapi.log.error('Failed to reinitialize the router.');

lib/configuration/hooks/studio/index.js

@@ -83,8 +83,11 @@ module.exports = function (strapi) {
 
           socket.on('connect', function () {
             firstConnectionAttempt = false;
+
+            strapi.once('bootstrap:done', function () {
               _self.connectWithStudio(socket);
             });
+          });
 
           socket.on('error', function (err) {
             strapi.log.warn(err);
@@ -334,9 +337,11 @@ module.exports = function (strapi) {
      */
 
     rebuild: function (data, cb) {
-      strapi.restart();
-
+      process.nextTick(function () {
+        strapi.restart(function () {
           cb(null, true);
+        });
+      });
     },
 
     /**

lib/configuration/hooks/waterline/index.js

@@ -5,6 +5,7 @@
  */
 
 // Node.js core.
+const cluster = require('cluster');
 const path = require('path');
 const spawn = require('child_process').spawnSync;
 
@@ -59,8 +60,9 @@ module.exports = function (strapi) {
      */
 
     initialize: function (cb) {
-      if (_.isPlainObject(strapi.config.orm) && !_.isEmpty(strapi.config.orm)) {
+      if (_.isPlainObject(strapi.config.orm) && !_.isEmpty(strapi.config.orm) && ((cluster.isWorker && strapi.config.reload.workers > 0) || (cluster.isMaster && strapi.config.reload.workers < 1))) {
         strapi.adapters = {};
+        strapi.collections = [];
 
         // Expose a new instance of Waterline.
         if (!strapi.orm) {
@@ -148,7 +150,11 @@ module.exports = function (strapi) {
 
           // Finally, load the collection in the Waterline instance.
           try {
-            strapi.orm.loadCollection(Waterline.Collection.extend(definition));
+            const collection = strapi.orm.loadCollection(Waterline.Collection.extend(definition));
+
+            if (_.isFunction(collection)) {
+              strapi.collections.push(collection);
+            }
           } catch (err) {
             strapi.log.error('Impossible to register the `' + model + '` model.');
             process.exit(1);
@@ -159,8 +165,8 @@ module.exports = function (strapi) {
         // globally expose models.
         strapi.orm.initialize({
           adapters: strapi.adapters,
-          models: strapi.models,
           connections: strapi.config.orm.connections,
+          collections: strapi.collections,
           defaults: {
             connection: strapi.config.orm.defaultConnection
           }
@@ -171,7 +177,6 @@ module.exports = function (strapi) {
               global[globalName] = strapi.orm.collections[model];
             });
           }
-        });
 
           // Parse each models and look for associations.
           _.forEach(strapi.orm.collections, function (definition, model) {
@@ -194,11 +199,12 @@ module.exports = function (strapi) {
               usefulFunctions: true
             });
           }
-      } else {
-        strapi.log.warn('Waterline ORM disabled!');
-      }
 
           cb();
+        });
+      } else {
+        cb();
+      }
     },
 
     /**
@@ -207,6 +213,8 @@ module.exports = function (strapi) {
 
     reload: function () {
       hook.teardown(function () {
+        delete strapi.orm;
+
         hook.initialize(function (err) {
           if (err) {
             strapi.log.error('Failed to reinitialize the ORM hook.');

lib/private/initialize.js

@@ -59,14 +59,28 @@ module.exports = function initialize(cb) {
     }
   });
 
-  // Only run the application bootstrap if
-  // we are in a master cluster.
   if (cluster.isMaster) {
+    _.forEach(cluster.workers, function (worker) {
+      worker.on('message', function () {
+        self.emit('bootstrap:done');
+      });
+    });
+  }
+
+  // Only run the application bootstrap on master cluster if we don't have any workers.
+  // Else, run the bootstrap logic on the workers.
+  if ((cluster.isWorker && strapi.config.reload.workers > 0) || (cluster.isMaster && strapi.config.reload.workers < 1)) {
     self.runBootstrap(function afterBootstrap(err) {
       if (err) {
         self.log.error('Bootstrap encountered an error.');
         return cb(self.log.error(err));
       }
+
+      if (cluster.isWorker) {
+        process.send('message');
+      } else {
+        self.emit('bootstrap:done');
+      }
     });
   }
 

lib/private/loadHooks.js

@@ -123,7 +123,7 @@ module.exports = function (strapi) {
 
       // Prepare all other hooks.
       prepare: function prepareHooks(cb) {
-        async.each(_.without(_.keys(hooks), '_config', '_api'), function (id, cb) {
+        async.each(_.without(_.keys(hooks), '_config', '_api', 'studio'), function (id, cb) {
           prepareHook(id);
           process.nextTick(cb);
         }, cb);
@@ -131,7 +131,7 @@ module.exports = function (strapi) {
 
       // Apply the default config for all other hooks.
       defaults: function defaultConfigHooks(cb) {
-        async.each(_.without(_.keys(hooks), '_config', '_api'), function (id, cb) {
+        async.each(_.without(_.keys(hooks), '_config', '_api', 'studio'), function (id, cb) {
           const hook = hooks[id];
           applyDefaults(hook);
           process.nextTick(cb);
@@ -140,9 +140,19 @@ module.exports = function (strapi) {
 
       // Load all other hooks.
       load: function loadOtherHooks(cb) {
-        async.each(_.without(_.keys(hooks), '_config', '_api'), function (id, cb) {
+        async.each(_.without(_.keys(hooks), '_config', '_api', 'studio'), function (id, cb) {
           loadHook(id, cb);
         }, cb);
+      },
+
+      // Load the studio hook.
+      studio: function loadStudioHook(cb) {
+        if (!hooks.studio) {
+          return cb();
+        }
+        prepareHook('studio');
+        applyDefaults(hooks.studio);
+        loadHook('studio', cb);
       }
     },
 

lib/restart.js

@@ -16,11 +16,10 @@ const async = require('async');
  * (useful for the Studio)
  */
 
-module.exports = function () {
+module.exports = function (cb) {
   const self = this;
 
   console.log();
-  self.log.debug('Rebuilding application dictionary...');
 
   // Update the Strapi status (might be used
   // by the core or some hooks).
@@ -32,15 +31,15 @@ module.exports = function () {
 
     // Rebuild the dictionaries.
     dictionaries: function (cb) {
-      self.hooks._config.reload();
-      self.hooks._api.reload();
+      self.on('hook:_config:reloaded', function () {
+        self.on('hook:_api:reloaded', function () {
           cb();
-    },
+        });
 
-    // Make sure to delete the router stack.
-    router: function (cb) {
-      delete self.router;
-      cb();
+        self.hooks._api.reload();
+      });
+
+      self.hooks._config.reload();
     }
   },
 
@@ -54,31 +53,44 @@ module.exports = function () {
       self.stop();
     }
 
-    // Kill every worker processes.
-    _.forEach(cluster.worker, function () {
-      process.kill(process.pid, 'SIGHUP');
-    });
-
     // Tell the application the framework is reloading
     // (might be used by some hooks).
     self.reloading = true;
 
     // Teardown Waterline adapters and
     // reload the Waterline ORM.
-    self.log.debug('Reloading the ORM...');
-    self.hooks.waterline.reload();
-
-    // Reloading the router.
-    self.log.debug('Reloading the router...');
-    self.hooks.router.reload();
+    self.after('hook:waterline:reloaded', function () {
+      self.after('hook:router:reloaded', function () {
+        process.nextTick(function () {
+          cb();
+        });
 
         // Update `strapi` status.
         self.reloaded = true;
         self.reloading = false;
 
         // Finally inform the developer everything seems ok.
-    self.log.info('Dictionary successfully rebuilt');
+        if (cluster.isMaster && _.isPlainObject(strapi.config.reload) && !_.isEmpty(strapi.config.reload) && strapi.config.reload.workers < 1) {
+          self.log.info('Application\'s dictionnary updated');
           self.log.warn('You still need to restart your server to fully enjoy changes...');
+        }
+
+        // Kill every worker processes.
+        _.forEach(cluster.workers, function () {
+          process.kill(process.pid, 'SIGHUP');
+        });
+
+        if (cluster.isMaster && _.isPlainObject(strapi.config.reload) && !_.isEmpty(strapi.config.reload) && strapi.config.reload.workers > 0) {
+          self.log.info('Application restarted');
           console.log();
+        }
+      });
+
+      // Reloading the router.
+      self.hooks.router.reload();
+    });
+
+    // Reloading the ORM.
+    self.hooks.waterline.reload();
   });
 };

package.json

@@ -129,6 +129,7 @@
       "no-else-return": 0,
       "no-extra-parens": 0,
       "no-implicit-coercion": 0,
+      "no-inner-declarations": 0,
       "no-invalid-this": 0,
       "no-negated-condition": 0,
       "no-throw-literal": 0,