From 600d2c8607a5b5d27473bc6017e6fe2825954f20 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Mon, 19 Jul 2021 13:40:47 -0400
Subject: [PATCH] Log as errors the places where getPortFrom can fail (#3425)

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/main/proxy/lens-proxy.ts          |  6 ++++--
 src/main/routes/port-forward-route.ts | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/proxy/lens-proxy.ts b/src/main/proxy/lens-proxy.ts
index 480a4b047a..9ffff0fd6a 100644
--- a/src/main/proxy/lens-proxy.ts
+++ b/src/main/proxy/lens-proxy.ts
@@ -61,7 +61,8 @@ export class LensProxy extends Singleton {
         if (req.url.startsWith(`${apiPrefix}?`)) {
           handleWsUpgrade(req, socket, head);
         } else {
-          this.handleProxyUpgrade(proxy, req, socket, head);
+          this.handleProxyUpgrade(proxy, req, socket, head)
+            .catch(error => logger.error(`[LENS-PROXY]: failed to handle proxy upgrade: ${error}`));
         }
       });
   }
@@ -194,7 +195,8 @@ export class LensProxy extends Singleton {
             logger.debug(`Retrying proxy request to url: ${reqId}`);
             setTimeout(() => {
               this.retryCounters.set(reqId, retryCount + 1);
-              this.handleRequest(proxy, req, res);
+              this.handleRequest(proxy, req, res)
+                .catch(error => logger.error(`[LENS-PROXY]: failed to handle request on proxy error: ${error}`));
             }, timeoutMs);
           }
         }
diff --git a/src/main/routes/port-forward-route.ts b/src/main/routes/port-forward-route.ts
index cfd88e771f..e97b4171cb 100644
--- a/src/main/routes/port-forward-route.ts
+++ b/src/main/routes/port-forward-route.ts
@@ -134,11 +134,22 @@ export class PortForwardRoute {
         name: resourceName,
         port,
       });
-      const started = await portForward.start();
 
-      if (!started) {
+      try {
+        const started = await portForward.start();
+
+        if (!started) {
+          logger.warn("[PORT-FORWARD-ROUTE]: failed to start a port-forward", { namespace, port, resourceType, resourceName });
+
+          return respondJson(response, {
+            message: "Failed to open port-forward"
+          }, 400);
+        }
+      } catch (error) {
+        logger.warn(`[PORT-FORWARD-ROUTE]: failed to open a port-forward: ${error}`, { namespace, port, resourceType, resourceName });
+
         return respondJson(response, {
-          message: "Failed to open port-forward"
+          message: error?.toString() || "Failed to open port-forward",
         }, 400);
       }
     }