Async/await let's go!

bin/genieacs-cwmp

@@ -27,7 +27,7 @@ function exitWorkerGracefully(): void {
 }
 
 function exitWorkerUngracefully(): void {
-  extensions.killAll(() => {
+  extensions.killAll().then(() => {
     process.exit(1);
   });
 }
@@ -97,10 +97,8 @@ if (!cluster.worker) {
       .catch(exitWorkerUngracefully);
   });
 
-  db.connect(err => {
-    if (err) throw err;
-    cache.connect(err => {
-      if (err) throw err;
+  Promise.all([db.connect(), cache.connect()])
+    .then(() => {
       server.start(
         SERVICE_PORT,
         SERVICE_ADDRESS,
@@ -108,6 +106,10 @@ if (!cluster.worker) {
         cwmp.listener,
         cwmp.onConnection
       );
+    })
+    .catch(err => {
+      setTimeout(() => {
+        throw err;
+      });
     });
-  });
 }

bin/genieacs-ext

@@ -59,7 +59,7 @@ function errorToFault(err: Error): Fault {
 process.on("uncaughtException", err => {
   const fault = errorToFault(err);
   jobs.forEach(jobId => {
-    process.send([jobId, fault]);
+    process.send([jobId, fault, null]);
   });
   jobs.clear();
   process.disconnect();
@@ -81,7 +81,7 @@ process.on("message", message => {
       code: "ext",
       message: `No such function '${funcName}' in extension '${fileName}'`
     };
-    process.send([message[0], fault]);
+    process.send([message[0], fault, null]);
     return;
   }
 

bin/genieacs-fs

@@ -93,11 +93,13 @@ if (!cluster.worker) {
       .catch(exitWorkerUngracefully);
   });
 
-  db.connect(err => {
-    if (err) throw err;
-    cache.connect(err => {
-      if (err) throw err;
+  Promise.all([db.connect(), cache.connect()])
+    .then(() => {
       server.start(SERVICE_PORT, SERVICE_ADDRESS, ssl, listener);
+    })
+    .catch(err => {
+      setTimeout(() => {
+        throw err;
+      });
     });
-  });
 }

bin/genieacs-nbi

@@ -27,7 +27,7 @@ function exitWorkerGracefully(): void {
 }
 
 function exitWorkerUngracefully(): void {
-  extensions.killAll(() => {
+  extensions.killAll().then(() => {
     process.exit(1);
   });
 }
@@ -97,11 +97,13 @@ if (!cluster.worker) {
       .catch(exitWorkerUngracefully);
   });
 
-  db.connect(err => {
-    if (err) throw err;
-    cache.connect(err => {
-      if (err) throw err;
+  Promise.all([db.connect(), cache.connect()])
+    .then(() => {
       server.start(SERVICE_PORT, SERVICE_ADDRESS, ssl, listener);
+    })
+    .catch(err => {
+      setTimeout(() => {
+        throw err;
+      });
     });
-  });
 }

bin/genieacs-ui

@@ -105,11 +105,13 @@ if (!cluster.worker) {
     listener(req, res);
   };
 
-  db2.connect(err => {
-    if (err) throw err;
-    cache.connect(err => {
-      if (err) throw err;
+  Promise.all([db2.connect(), cache.connect()])
+    .then(() => {
       server.start(SERVICE_PORT, SERVICE_ADDRESS, ssl, _listener);
+    })
+    .catch(err => {
+      setTimeout(() => {
+        throw err;
+      });
     });
-  });
 }