feat: pr feedback

homarr-labs · Dec 2, 2024 · 3d7fbfb · 3d7fbfb
1 parent 8fd8f7d
commit 3d7fbfb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/packages/definitions/src/integration.ts b/packages/definitions/src/integration.ts
@@ -144,7 +144,7 @@ export const integrationDefs = {
     category: ["healthMonitoring"],
     supportsSearch: false,
   },
-  getDashDot: {
+  dashDot: {
     name: "Dash.",
     secretKinds: [[]],
     category: ["healthMonitoring"],

diff --git a/packages/integrations/src/base/integration.ts b/packages/integrations/src/base/integration.ts
@@ -92,14 +92,6 @@ export abstract class Integration {
 
     await handleResponseAsync?.(response);
   }
-
-  protected appendPathToUrlWithEndingSlash(basename: string, path: string) {
-    if (basename.endsWith("/")) {
-      return `${basename}${path}`;
-    }
-
-    return `${basename}/${path}`;
-  }
 }
 
 export interface TestConnectionError {

diff --git a/packages/integrations/src/dashdot/dashdot-integration.ts b/packages/integrations/src/dashdot/dashdot-integration.ts
@@ -12,7 +12,7 @@ import type { HealthMonitoring } from "../types";
 
 export class DashDotIntegration extends Integration {
   public async testConnectionAsync(): Promise<void> {
-    const response = await fetch(this.appendPathToUrlWithEndingSlash(this.integration.url, "info"));
+    const response = await fetch(this.url("/info"));
     await response.json();
   }
 
@@ -25,8 +25,6 @@ export class DashDotIntegration extends Integration {
     const channel = createChannelEventHistory<CpuLoadApi[]>(`integration:${this.integration.id}:history:cpu`, 100);
     const history = await channel.getSliceUntilTimeAsync(dayjs().subtract(15, "minutes").toDate());
 
-    // logger.info(JSON.stringify(history));
-
     logger.info(
       JSON.stringify({
         "1min": this.getAverageOfCpu(history[0]).toFixed(2),
@@ -62,7 +60,7 @@ export class DashDotIntegration extends Integration {
   }
 
   private async getInfoAsync() {
-    const infoResponse = await fetch(this.appendPathToUrlWithEndingSlash(this.integration.url, "info"));
+    const infoResponse = await fetch(this.url("/info"));
     const serverInfo = (await infoResponse.json()) as InternalServerInfo;
     return {
       maxAvailableMemoryBytes: serverInfo.ram.size,
@@ -76,7 +74,7 @@ export class DashDotIntegration extends Integration {
 
   private async getCurrentCpuLoadAsync() {
     const channel = createChannelEventHistory<CpuLoadApi[]>(`integration:${this.integration.id}:history:cpu`, 100);
-    const cpu = await fetch(this.appendPathToUrlWithEndingSlash(this.integration.url, "load/cpu"));
+    const cpu = await fetch(this.url("/load/cpu"));
     const data = (await cpu.json()) as CpuLoadApi[];
     await channel.pushAsync(data);
     return {
@@ -98,12 +96,12 @@ export class DashDotIntegration extends Integration {
   }
 
   private async getCurrentStorageLoadAsync() {
-    const storageLoad = await fetch(this.appendPathToUrlWithEndingSlash(this.integration.url, "load/storage"));
+    const storageLoad = await fetch(this.url("/load/storage"));
     return (await storageLoad.json()) as number[];
   }
 
   private async getCurrentMemoryLoadAsync() {
-    const memoryLoad = await fetch(this.appendPathToUrlWithEndingSlash(this.integration.url, "load/ram"));
+    const memoryLoad = await fetch(this.url("/load/ram"));
     const data = (await memoryLoad.json()) as MemoryLoadApi;
     return {
       loadInBytes: data.load,

diff --git a/packages/redis/src/lib/channel.ts b/packages/redis/src/lib/channel.ts
@@ -193,7 +193,6 @@ export const createChannelEventHistory = <TData>(channelName: string, maxElement
     if (length <= maxElements) {
       return;
     }
-    logger.warn(`Trimming from ${length - maxElements} to ${length}`);
     await getSetClient.ltrim(channelName, length - maxElements, length);
   };
-Original file line number
+Diff line change
@@ Expand Up @@
         if (length <= maxElements) {
           return;
         }
-        logger.warn(`Trimming from ${length - maxElements} to ${length}`);
         await getSetClient.ltrim(channelName, length - maxElements, length);
       };
@@ Expand Down @@