From cdbe980ac736a43d2d5b849bfa02f84e12ad066d Mon Sep 17 00:00:00 2001
From: Jesse Chan <jc@linux.com>
Date: Sun, 20 Sep 2020 00:34:02 +0800
Subject: [PATCH] server: handle some unhandled promise rejections

Unhandled Promise rejections are strictly prohibited and will
lead to NodeJS process termination in the future Node release.

This change also fixes some logics.
---
 server/middleware/clientActivityStream.js | 2 +-
 server/services/clientGatewayService.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/middleware/clientActivityStream.js b/server/middleware/clientActivityStream.js
index 96e9d179..1d5c7f6c 100644
--- a/server/middleware/clientActivityStream.js
+++ b/server/middleware/clientActivityStream.js
@@ -80,7 +80,7 @@ export default (req, res) => {
   });
 
   if (serviceInstances.clientGatewayService.hasError) {
-    serviceInstances.clientGatewayService.testGateway();
+    serviceInstances.clientGatewayService.testGateway().catch(console.error);
   }
 
   // TODO: Handle empty or sub-optimal history states.
diff --git a/server/services/clientGatewayService.js b/server/services/clientGatewayService.js
index 028471cb..29fba2e0 100644
--- a/server/services/clientGatewayService.js
+++ b/server/services/clientGatewayService.js
@@ -118,7 +118,7 @@ class ClientGatewayService extends BaseService {
 
         return response;
       })
-      .catch(this.processClientError);
+      .catch(this.processClientRequestError);
   }
 
   /**