DatabaseManager.ts error handling update

backend/model/mongoose/DatabaseManager.ts

@@ -1,44 +1,46 @@
 ///<reference path="../../../typings/main.d.ts"/>
 
-import * as mongoose from 'mongoose';
+import * as mongoose from "mongoose";
 import {Schema} from "mongoose";
+
 export class DatabaseManager {
     private static _instance:DatabaseManager = null;
     private connectionError = false;
+    private errorObject = null;
+    private connectionOpen = false;
 
-    constructor(onError?:(err)=>void,onConnected?:() =>void){
+    constructor() {
-        mongoose.connection.on('error', function (err) {
-            this.connectionError = true;
-            if(onError){
-                onError(err);
-            }
-        });
-        mongoose.connection.on('connected', function () {
-            if(onConnected){
-                onConnected();
-            }
-        });
-        try {
         mongoose.connect('mongodb://localhost/EQZT6L');
-        }catch(ex){
-            this.connectionError = true;
-            if(onError){
-                onError(ex);
-            }
-        }
     }
 
     public static getInstance(onError?:(err)=>void, onConnected?:() =>void) { 
         if (DatabaseManager._instance === null) {
-            DatabaseManager._instance = new DatabaseManager(onError,onConnected);
+            DatabaseManager._instance = new DatabaseManager();
-        }else{
-            if(DatabaseManager._instance.connectionError === false && onConnected){
-                onConnected();
-            }
         }  
         return DatabaseManager._instance;
     }
 
+    public onConnectionError(onError:(err) => void){
+        if (this.connectionError === true) {
+           return onError(DatabaseManager._instance.errorObject);
+        }
+        mongoose.connection.once('error', (err) => {
+            this.connectionError = true;
+            this.errorObject = err;
+            onError(err); 
+        });
+    }
+
+    public onConnected(onConnected:() => void){
+        if (this.connectionOpen === true) {
+            return onConnected();
+        }
+        mongoose.connection.once('open', (err) => {
+            this.connectionOpen = true;
+            onConnected();
+        });
+    }
+    
     public getModel(name:string, schema:any) {
         return mongoose.model(name, new Schema(schema));
     }

backend/server.ts

@@ -1,10 +1,10 @@
 ///<reference path="../typings/main.d.ts"/>
 
-import * as _express from 'express';
+import * as _express from "express";
-import * as _session from 'express-session';
+import * as _session from "express-session";
-import * as _bodyParser from 'body-parser';
+import * as _bodyParser from "body-parser";
-import * as _debug from 'debug';
+import * as _debug from "debug";
-import * as _http from 'http';
+import * as _http from "http";
 import {PublicRouter} from "./routes/PublicRouter";
 import {UserRouter} from "./routes/UserRouter";
 import {GalleryRouter} from "./routes/GalleryRouter";
@@ -13,8 +13,6 @@ import {ErrorRouter} from "./routes/ErrorRouter";
 import {SharingRouter} from "./routes/SharingRouter";
 import {Config, DatabaseType} from "./config/Config";
 import {ObjectManagerRepository} from "./model/ObjectManagerRepository";
-import {MongoGalleryManager} from "./model/mongoose/MongoGalleryManager";
-import {MongoUserManager} from "./model/mongoose/MongoUserManager";
 import {DatabaseManager} from "./model/mongoose/DatabaseManager";
 
 
@@ -60,16 +58,14 @@ export class Server {
  
         if (Config.databaseType === DatabaseType.memory) {
             ObjectManagerRepository.MemoryMongoManagers();
-        }else {
-            if (DatabaseManager.getInstance(()=>{
-                    console.error("MongoDB connection error. Falling back to memory Object Managers");
-                    ObjectManagerRepository.MemoryMongoManagers();
-                }).isConnectionError()) {
-                console.error("MongoDB connection error. Falling back to memory Object Managers");
-                ObjectManagerRepository.MemoryMongoManagers();
         } else {
             ObjectManagerRepository.InitMongoManagers();
-            }
+            DatabaseManager.getInstance().onConnectionError(
+                ()=> {
+                    console.error("MongoDB connection error. Falling back to memory Object Managers");
+                    ObjectManagerRepository.MemoryMongoManagers();
+                });
+
         }
 
         new PublicRouter(this.app);
@@ -82,8 +78,6 @@ export class Server {
         new ErrorRouter(this.app);
 
 
-
-
         // Get PORT from environment and store in Express.
         this.app.set('port', Config.PORT);
 
@@ -99,8 +93,6 @@ export class Server {
     }
 
 
-    
-
     /**
      * Event listener for HTTP server "error" event.
      */
@@ -143,7 +135,6 @@ export class Server {
 }
 
 
-
 if (process.env.DEBUG) {
     console.log("Running in DEBUG mode");
 }

test/backend/initMongo.ts

@@ -1,35 +1,32 @@
-
 import {MongoUserManager} from "../../backend/model/mongoose/MongoUserManager";
 import {User, UserRoles} from "../../common/entities/User";
 import {DatabaseManager} from "../../backend/model/mongoose/DatabaseManager";
 
-DatabaseManager.getInstance((err)=>{
+
+DatabaseManager.getInstance().onConnectionError(()=> {
     DatabaseManager.getInstance().disconnect();
     process.exit()
-},()=>{
+});
+
+DatabaseManager.getInstance().onConnected(()=> {
     let userManager = new MongoUserManager();
     userManager.createUser(new User(0, "demo", "demo", UserRoles.Developer), (err)=> {
-        DatabaseManager.getInstance().disconnect();
-        process.exit()
-    });
 
         userManager.createUser(new User(1, "developer", "developer", UserRoles.Developer), (err)=> {
-        DatabaseManager.getInstance().disconnect();
-        process.exit()
-    });
 
             userManager.createUser(new User(2, "admin", "admin", UserRoles.Admin), (err)=> {
-        DatabaseManager.getInstance().disconnect();
-        process.exit()
-    });
 
                 userManager.createUser(new User(3, "user", "user", UserRoles.User), (err)=> {
-        DatabaseManager.getInstance().disconnect();
-        process.exit()
-    });
 
                     userManager.createUser(new User(4, "guest", "guest", UserRoles.Guest), (err)=> {
+
                         DatabaseManager.getInstance().disconnect();
                         process.exit()
                     });
                 });
+            });
+        });
+    });
+
+
+});