Reduce duplicated error handling when the clusterMasterHandler is a g…

…enerator
TeaEntityLab · Jun 28, 2018 · 3cf79ba · 3cf79ba
1 parent f10e60b
commit 3cf79ba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -195,7 +195,7 @@ wsgilite.addClusterMasterRequestHandler(async (worker, msg, handle) => {
 wsgilite.GET('/requestActionOnClusterMaster', async function (request, response, meta) {
   // {"event":"MSG_WSGILITE_DO_THINGS_WORKER_SUCCESS","result":[{"data":"user01"}]}
   return wsgilite.requestActionOnClusterMaster({action: 'readrecord'}).catch((e)=>{
-    console.log(e);
+    console.log(`I got error: ${e.errorMessage}`);
     return e.errorMessage;
   });
 });

diff --git a/demo/simple-routing.js b/demo/simple-routing.js
@@ -150,7 +150,7 @@ wsgilite.addClusterMasterRequestHandler(async (worker, msg, handle) => {
 wsgilite.GET('/requestActionOnClusterMaster', async function (request, response, meta) {
   // {"event":"MSG_WSGILITE_DO_THINGS_WORKER_SUCCESS","result":[{"data":"user01"}]}
   return wsgilite.requestActionOnClusterMaster({action: 'readrecord'}).catch((e)=>{
-    console.log(e);
+    console.log(`I got error: ${e.errorMessage}`);
     return e.errorMessage;
   });
 });

diff --git a/wsgilite.js b/wsgilite.js
@@ -418,13 +418,15 @@ class WSGILite extends DefSubRoute {
   }
   handleClusterMasterRequest(worker, msg, handle) {
     let result = [];
+    let errorHandled = false;
 
     const self = this;
     const errorHandler = (e) => {
-      console.log(e);
-      if (worker) {
+      if (worker && (!errorHandled)) {
+        console.log(e);
         worker.send({event: MSG_WSGILITE_DO_THINGS_WORKER_FAILURE, error: e, errorMessage: e.toString(), errorStacktrace: e.stacktrace});
       }
+      errorHandled = true;
       return Promise.reject(e);
     };
     return MonadIO.generatorToPromise(function *() {