revert unused axios error changes

hyperjumptech · Jan 17, 2025 · 105ca76 · 105ca76
1 parent 8685067
commit 105ca76
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 6 deletions.
diff --git a/packages/notification/channel/instatus/index.ts b/packages/notification/channel/instatus/index.ts
@@ -27,7 +27,6 @@ import type { AxiosRequestConfig } from 'axios'
 import http from 'http'
 import https from 'https'
 import Joi from 'joi'
-import { getErrorMessage } from '../../utils/catch-error-handler.js'
 import {
   findIncident,
   insertIncident as insertIncidentToDatabase,
@@ -140,7 +139,15 @@ async function createIncident(
 
     await insertIncidentToDatabase({ incidentID, probeID, status, url })
   } catch (error: unknown) {
-    throw new Error(getErrorMessage(error))
+    const axiosError =
+      error instanceof axios.AxiosError ? error : new axios.AxiosError()
+    throw new Error(
+      `${axiosError?.message}${
+        axiosError?.response?.data
+          ? `. ${axiosError?.response?.data?.message}`
+          : ''
+      }`
+    )
   }
 }
 
@@ -185,7 +192,15 @@ async function updateIncident(
       getAxiosConfig(apiKey)
     )
   } catch (error: unknown) {
-    throw new Error(getErrorMessage(error))
+    const axiosError =
+      error instanceof axios.AxiosError ? error : new axios.AxiosError()
+    throw new Error(
+      `${axiosError.message}${
+        axiosError?.response?.data
+          ? `. ${axiosError?.response?.data?.message}`
+          : ''
+      }`
+    )
   }
 
   await updateIncidentToDatabase({ incidentID, status })

diff --git a/src/plugins/visualization/atlassian-status-page/index.ts b/src/plugins/visualization/atlassian-status-page/index.ts
@@ -27,7 +27,6 @@ import http from 'http'
 import https from 'https'
 import Joi from 'joi'
 
-import { getErrorMessage } from '../../../utils/catch-error-handler.js'
 import {
   findIncident,
   insertIncident as insertIncidentToDatabase,
@@ -136,7 +135,15 @@ export class AtlassianStatusPageAPI {
 
       return incidentID
     } catch (error: unknown) {
-      throw new Error(getErrorMessage(error))
+      const axiosError =
+        error instanceof axios.AxiosError ? error : new axios.AxiosError()
+      throw new Error(
+        `${axiosError?.message}${
+          axiosError?.response?.data
+            ? `. ${axiosError?.response?.data?.message}`
+            : ''
+        }`
+      )
     }
   }
 
@@ -168,7 +175,15 @@ export class AtlassianStatusPageAPI {
         this.axiosConfig
       )
     } catch (error: unknown) {
-      throw new Error(getErrorMessage(error))
+      const axiosError =
+        error instanceof axios.AxiosError ? error : new axios.AxiosError()
+      throw new Error(
+        `${axiosError?.message}${
+          axiosError?.response?.data
+            ? `. ${axiosError?.response?.data?.message}`
+            : ''
+        }`
+      )
     }
 
     await updateIncidentToDatabase({ incidentID, status })