From e92ccc30ba87adc21a1db3f6f9bf8f99c93142d4 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 28 Feb 2024 11:44:32 -0800
Subject: [PATCH] Fix: only log errors directly if exist

---
 src/pages/api/config/[path].js                  | 2 +-
 src/pages/api/docker/stats/[...service].js      | 2 +-
 src/pages/api/docker/status/[...service].js     | 2 +-
 src/pages/api/kubernetes/stats/[...service].js  | 2 +-
 src/pages/api/kubernetes/status/[...service].js | 2 +-
 src/pages/api/services/proxy.js                 | 4 ++--
 src/pages/api/widgets/kubernetes.js             | 2 +-
 src/pages/index.jsx                             | 2 +-
 src/utils/config/service-helpers.js             | 2 +-
 src/utils/proxy/http.js                         | 4 ++--
 src/widgets/audiobookshelf/proxy.js             | 2 +-
 src/widgets/gamedig/proxy.js                    | 2 +-
 src/widgets/minecraft/proxy.js                  | 2 +-
 src/widgets/pyload/proxy.js                     | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/pages/api/config/[path].js b/src/pages/api/config/[path].js
index 7f3b6a079..6cb04698f 100644
--- a/src/pages/api/config/[path].js
+++ b/src/pages/api/config/[path].js
@@ -28,7 +28,7 @@ export default async function handler(req, res) {
     res.setHeader("Content-Type", mimeType);
     return res.status(200).send(fileContent);
   } catch (error) {
-    logger.error(error);
+    if (error) logger.error(error);
     return res.status(500).end("Internal Server Error");
   }
 }
diff --git a/src/pages/api/docker/stats/[...service].js b/src/pages/api/docker/stats/[...service].js
index 715e51881..e92bad7ce 100644
--- a/src/pages/api/docker/stats/[...service].js
+++ b/src/pages/api/docker/stats/[...service].js
@@ -80,7 +80,7 @@ export default async function handler(req, res) {
       error: "not found",
     });
   } catch (e) {
-    logger.error(e);
+    if (e) logger.error(e);
     return res.status(500).send({
       error: { message: e?.message ?? "Unknown error" },
     });
diff --git a/src/pages/api/docker/status/[...service].js b/src/pages/api/docker/status/[...service].js
index 96c6bea60..f9dc640bb 100644
--- a/src/pages/api/docker/status/[...service].js
+++ b/src/pages/api/docker/status/[...service].js
@@ -108,7 +108,7 @@ export default async function handler(req, res) {
       status: "not found",
     });
   } catch (e) {
-    logger.error(e);
+    if (e) logger.error(e);
     return res.status(500).send({
       error: { message: e?.message ?? "Unknown error" },
     });
diff --git a/src/pages/api/kubernetes/stats/[...service].js b/src/pages/api/kubernetes/stats/[...service].js
index 90a67becd..b1bf83450 100644
--- a/src/pages/api/kubernetes/stats/[...service].js
+++ b/src/pages/api/kubernetes/stats/[...service].js
@@ -106,7 +106,7 @@ export default async function handler(req, res) {
       stats,
     });
   } catch (e) {
-    logger.error(e);
+    if (e) logger.error(e);
     res.status(500).send({
       error: "unknown error",
     });
diff --git a/src/pages/api/kubernetes/status/[...service].js b/src/pages/api/kubernetes/status/[...service].js
index 1ca191261..f771d69df 100644
--- a/src/pages/api/kubernetes/status/[...service].js
+++ b/src/pages/api/kubernetes/status/[...service].js
@@ -59,7 +59,7 @@ export default async function handler(req, res) {
       status,
     });
   } catch (e) {
-    logger.error(e);
+    if (e) logger.error(e);
     res.status(500).send({
       error: "unknown error",
     });
diff --git a/src/pages/api/services/proxy.js b/src/pages/api/services/proxy.js
index 80856419a..be4a96a67 100644
--- a/src/pages/api/services/proxy.js
+++ b/src/pages/api/services/proxy.js
@@ -71,8 +71,8 @@ export default async function handler(req, res) {
 
     logger.debug("Unknown proxy service type: %s", type);
     return res.status(403).json({ error: "Unkown proxy service type" });
-  } catch (ex) {
-    logger.error(ex);
+  } catch (e) {
+    if (e) logger.error(e);
     return res.status(500).send({ error: "Unexpected error" });
   }
 }
diff --git a/src/pages/api/widgets/kubernetes.js b/src/pages/api/widgets/kubernetes.js
index b55b02d73..0859212fa 100644
--- a/src/pages/api/widgets/kubernetes.js
+++ b/src/pages/api/widgets/kubernetes.js
@@ -94,7 +94,7 @@ export default async function handler(req, res) {
       nodes: Object.entries(nodeMap).map(([name, node]) => ({ name, ...node })),
     });
   } catch (e) {
-    logger.error("exception %s", e);
+    if (e) logger.error(e);
     return res.status(500).send({
       error: "unknown error",
     });
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index b5aac8a96..b62f9ab2d 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -65,7 +65,7 @@ export async function getStaticProps() {
       },
     };
   } catch (e) {
-    if (logger) {
+    if (logger && e) {
       logger.error(e);
     }
     return {
diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 9f9979150..77c9a673c 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -325,7 +325,7 @@ export async function servicesFromKubernetes() {
 
     return mappedServiceGroups;
   } catch (e) {
-    logger.error(e);
+    if (e) logger.error(e);
     throw e;
   }
 }
diff --git a/src/utils/proxy/http.js b/src/utils/proxy/http.js
index 1755dd936..ff34ce0d6 100644
--- a/src/utils/proxy/http.js
+++ b/src/utils/proxy/http.js
@@ -44,7 +44,7 @@ function handleRequest(requestor, url, params) {
 
         // zlib errors
         responseContent.on("error", (e) => {
-          logger.error(e);
+          if (e) logger.error(e);
           responseContent = response; // fallback
         });
         response.pipe(responseContent);
@@ -112,7 +112,7 @@ export async function httpProxy(url, params = {}) {
       constructedUrl.port ? `:${constructedUrl.port}` : "",
       constructedUrl.pathname,
     );
-    logger.error(err);
+    if (err) logger.error(err);
     return [500, "application/json", { error: { message: err?.message ?? "Unknown error", url, rawError: err } }, null];
   }
 }
diff --git a/src/widgets/audiobookshelf/proxy.js b/src/widgets/audiobookshelf/proxy.js
index c4dba5cdb..9701c1feb 100644
--- a/src/widgets/audiobookshelf/proxy.js
+++ b/src/widgets/audiobookshelf/proxy.js
@@ -63,7 +63,7 @@ export default async function audiobookshelfProxyHandler(req, res) {
 
     return res.status(200).send(libraryStats);
   } catch (e) {
-    logger.error(e.message);
+    if (e) logger.error(e);
     return res.status(500).send({ error: { message: e.message } });
   }
 }
diff --git a/src/widgets/gamedig/proxy.js b/src/widgets/gamedig/proxy.js
index 0029834c5..8a7e55c5a 100644
--- a/src/widgets/gamedig/proxy.js
+++ b/src/widgets/gamedig/proxy.js
@@ -28,7 +28,7 @@ export default async function gamedigProxyHandler(req, res) {
       ping: serverData.ping,
     });
   } catch (e) {
-    logger.error(e);
+    if (e) logger.error(e);
 
     res.status(200).send({
       online: false,
diff --git a/src/widgets/minecraft/proxy.js b/src/widgets/minecraft/proxy.js
index 7aeedfb99..f7bac9d45 100644
--- a/src/widgets/minecraft/proxy.js
+++ b/src/widgets/minecraft/proxy.js
@@ -18,7 +18,7 @@ export default async function minecraftProxyHandler(req, res) {
       players: pingResponse.players,
     });
   } catch (e) {
-    logger.error(e);
+    if (e) logger.error(e);
     res.status(200).send({
       version: undefined,
       online: false,
diff --git a/src/widgets/pyload/proxy.js b/src/widgets/pyload/proxy.js
index 802a67c6c..4d7cd1168 100644
--- a/src/widgets/pyload/proxy.js
+++ b/src/widgets/pyload/proxy.js
@@ -103,7 +103,7 @@ export default async function pyloadProxyHandler(req, res) {
       }
     }
   } catch (e) {
-    logger.error(e);
+    if (e) logger.error(e);
     return res.status(500).send({ error: { message: `Error communicating with Pyload API: ${e.toString()}` } });
   }