Refactor setup

Author: davidmerfield

Diff for: app/index.js

@@ -1,47 +1,20 @@
 const config = require("config");
-
 const clfdate = require("helper/clfdate");
 const email = require("helper/email");
-const scheduler = require("./scheduler");
 const setup = require("./setup");
 const server = require("./server");
-const flush = require("documentation/tools/flush-cache");
-const configureLocalBlogs = require("./configure-local-blogs");
-
-console.log(clfdate(), `Starting server`);
 
+console.log(clfdate(), `Starting server env=${config.environment}`);
 setup(async (err) => {
   if (err) throw err;
 
-  // Flush the cache of the public site and documentation
-  flush();
-
-  // This is the master process
-  if (config.master) {
-    // Launch scheduler for background tasks, like backups, emails
-    scheduler();
-
-    // Run any initialization that clients need
-    // Google Drive will renew any webhooks, e.g.
-    for (const { init, display_name } of Object.values(require("clients"))) {
-      if (init) {
-        console.log(clfdate(), display_name + " client:", "Initializing");
-        init();
-      }
-    }
-  }
-
-  // Send an email notification if the server starts or restarts
-  email.SERVER_START(null, { container: config.container });
-
   console.log(clfdate(), "Finished setting up server");
 
   // Open the server to handle requests
   server.listen(config.port, function () {
     console.log(clfdate(), `Server listening`);
-
-    if (config.environment === "development") {
-      configureLocalBlogs();
-    }
+    
+    // Send an email notification if the server starts or restarts
+    email.SERVER_START(null, { container: config.container });
   });
 });

Diff for: app/setup.js

@@ -1,16 +1,18 @@
 const config = require("config");
 const fs = require("fs-extra");
 
-const redis = require("models/redis");
-const client = new redis();
+const client = require("models/client");
 const documentation = require("./documentation/build");
 const templates = require("./templates");
 const folders = require("./templates/folders");
 const async = require("async");
 const clfdate = require("helper/clfdate");
+const scheduler = require("./scheduler");
+const flush = require("documentation/tools/flush-cache");
+const configureLocalBlogs = require("./configure-local-blogs");
 
-const log = (...arguments) =>
-  console.log.apply(null, [clfdate(), "Setup:", ...arguments]);
+const log = (...args) =>
+  console.log.apply(null, [clfdate(), "Setup:", ...args]);
 
 function main(callback) {
   async.series(
@@ -72,25 +74,57 @@ function main(callback) {
 
       async function () {
         // The docker build stage for production runs this script ahead of time
-        if (config.environment === "development") {
-          await documentation({ watch: true });
-        } else {
-          log("Skipping documentation build");
-        }
+        if (config.environment !== "development") return;
+        await documentation({ watch: true });
       },
 
       async function () {
-        if (config.environment === "production" && config.master) {
-          log("Building folders");
-          try {
-            await folders();
-            log("Built folders");
-          } catch (e) {
-            log("Error building folders", e);
+        if (config.environment !== "production") return;
+        if (!config.master) return;
+
+        log("Building folders");
+        try {
+          await folders();
+          log("Built folders");
+        } catch (e) {
+          log("Error building folders", e);
+        }
+      },
+
+      function (callback) {
+        if (!config.master) return callback();
+
+        // Launch scheduler for background tasks, like backups, emails
+        scheduler();
+        callback();
+      },
+
+      function (callback) {
+        if (!config.master) return callback();
+
+        // Run any initialization that clients need
+        // Google Drive will renew any webhooks, e.g.
+        for (const { init, display_name } of Object.values(
+          require("clients")
+        )) {
+          if (init) {
+            console.log(clfdate(), display_name + " client:", "Initializing");
+            init();
           }
-        } else {
-          log("Skipping folder build");
         }
+        callback();
+      },
+
+      function (callback) {
+        // Flush the cache of the public site and documentation
+        flush();
+
+        callback();
+      },
+
+      function (callback) {
+        if (config.environment !== "development") return callback();
+        configureLocalBlogs();
       },
     ],
     callback