Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development

server/app-builder.js

@@ -62,6 +62,13 @@ const interoperableErrors = require('../shared/interoperable-errors');
 const { getTrustedUrl } = require('./lib/urls');
 const { AppType } = require('../shared/app');
 
+
+let isReady = false;
+function setReady() {
+    isReady = true;
+}
+
+
 hbs.registerPartials(__dirname + '/views/partials');
 hbs.registerPartials(__dirname + '/views/subscription/partials/');
 
@@ -201,6 +208,19 @@ function createApp(appType) {
         limit: config.www.postSize
     }));
 
+
+    app.use((req, res, next) => {
+        if (isReady) {
+            next();
+        } else {
+            res.status(500);
+            res.render('error', {
+                message: 'Mailtrain is starting. Try again after a few seconds.',
+                error: {}
+            });
+        }
+    });
+
     if (appType === AppType.TRUSTED) {
         passport.setupRegularAuth(app);
     } else if (appType === AppType.SANDBOXED) {
@@ -385,3 +405,4 @@ function createApp(appType) {
 }
 
 module.exports.createApp = createApp;
+module.exports.setReady = setReady;

server/index.js

@@ -92,37 +92,36 @@ dbcheck(err => { // Check if database needs upgrading before starting the server
 */
 
     .then(() =>
-        executor.spawn(() => {
+        executor.spawn(() => 
-            testServer(() => {
+            testServer(() => 
-                verpServer(() => {
+                verpServer(() => 
-                    startHTTPServer(AppType.TRUSTED, 'trusted', trustedPort, () => {
+                    startHTTPServer(AppType.TRUSTED, 'trusted', trustedPort, () => 
-                        startHTTPServer(AppType.SANDBOXED, 'sandbox', sandboxPort, () => {
+                        startHTTPServer(AppType.SANDBOXED, 'sandbox', sandboxPort, () => 
                             startHTTPServer(AppType.PUBLIC, 'public', publicPort, () => {
                                 privilegeHelpers.dropRootPrivileges();
 
                                 tzupdate.start();
 
-                                importer.spawn(() => {
+                                importer.spawn(() => 
-                                    feedcheck.spawn(() => {
+                                    feedcheck.spawn(() => 
                                         senders.spawn(() => {
                                             triggers.start();
                                             gdprCleanup.start();
 
                                             postfixBounceServer(async () => {
-                                                (async () => {
                                                 await reportProcessor.init();
                                                 log.info('Service', 'All services started');
-                                                })();
+                                                appBuilder.setReady();
-                                            });
-                                        });
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
                                             });
                                         })
+                                    )
+                                );
+                            })
+                        )
+                    )
+                )
+            )
+        )
     );
 });