fix logger issues

mogery · mogery · commit 3ee8cc7f0dce · 2024-10-28T21:11:45.000+01:00
diff --git a/apps/api/src/controllers/v0/admin/acuc-cache-clear.ts b/apps/api/src/controllers/v0/admin/acuc-cache-clear.ts
@@ -1,7 +1,7 @@
 import { Request, Response } from "express";
 import { supabase_service } from "../../../services/supabase";
 import { clearACUC } from "../../auth";
-import { Logger } from "../../../lib/logger";
+import { logger } from "../../../lib/logger";
 
 export async function acucCacheClearController(req: Request, res: Response) {
   try {
@@ -12,11 +12,11 @@ export async function acucCacheClearController(req: Request, res: Response) {
       .select("*")
       .eq("team_id", team_id);
 
-    await Promise.all(keys.data.map((x) => clearACUC(x.key)));
+    await Promise.all((keys.data ?? []).map((x) => clearACUC(x.key)));
 
     res.json({ ok: true });
   } catch (error) {
-    Logger.error(`Error clearing ACUC cache via API route: ${error}`);
+    logger.error(`Error clearing ACUC cache via API route: ${error}`);
     res.status(500).json({ error: "Internal server error" });
   }
 }
diff --git a/apps/api/src/example.ts b/apps/api/src/example.ts
diff --git a/apps/api/src/services/billing/auto_charge.ts b/apps/api/src/services/billing/auto_charge.ts
@@ -1,6 +1,6 @@
 // Import necessary dependencies and types
 import { AuthCreditUsageChunk } from "../../controllers/v1/types";
-import { getACUC, setCachedACUC } from "../../controllers/auth";
+import { getACUC } from "../../controllers/auth";
 import { redlock } from "../redlock";
 import { supabase_service } from "../supabase";
 import { createPaymentIntent } from "./stripe";
@@ -9,7 +9,7 @@ import { sendNotification } from "../notification/email_notification";
 import { NotificationType } from "../../types";
 import { deleteKey, getValue, setValue } from "../redis";
 import { sendSlackWebhook } from "../alerts/slack";
-import { Logger } from "../../lib/logger";
+import { logger } from "../../lib/logger";
 
 // Define the number of credits to be added during auto-recharge
 const AUTO_RECHARGE_CREDITS = 1000;
@@ -32,7 +32,7 @@ export async function autoCharge(
     // Another check to prevent race conditions, double charging - cool down of 5 minutes
     const cooldownValue = await getValue(cooldownKey);
     if (cooldownValue) {
-      Logger.info(`Auto-recharge for team ${chunk.team_id} is in cooldown period`);
+      logger.info(`Auto-recharge for team ${chunk.team_id} is in cooldown period`);
       return {
         success: false,
         message: "Auto-recharge is in cooldown period",
@@ -59,7 +59,7 @@ export async function autoCharge(
               .single();
           
           if (customersError) {
-            Logger.error(`Error fetching customer data: ${customersError}`);
+            logger.error(`Error fetching customer data: ${customersError}`);
             return {
               success: false,
               message: "Error fetching customer data",
@@ -124,7 +124,7 @@ export async function autoCharge(
                   false,
                   process.env.SLACK_ADMIN_WEBHOOK_URL
                 ).catch((error) => {
-                  Logger.debug(`Error sending slack notification: ${error}`);
+                  logger.debug(`Error sending slack notification: ${error}`);
                 });
                 
                 // Set cooldown for 1 hour
@@ -138,7 +138,7 @@ export async function autoCharge(
               chunk: {...chunk, remaining_credits: chunk.remaining_credits + AUTO_RECHARGE_CREDITS},
             };
           } else {
-            Logger.error("No Stripe customer ID found for user");
+            logger.error("No Stripe customer ID found for user");
             return {
               success: false,
               message: "No Stripe customer ID found for user",
@@ -147,7 +147,7 @@ export async function autoCharge(
             };
           }
         } else {
-            Logger.error("No sub_user_id found in chunk");
+          logger.error("No sub_user_id found in chunk");
           return {
             success: false,
             message: "No sub_user_id found in chunk",
@@ -165,7 +165,7 @@ export async function autoCharge(
 
     });
   } catch (error) {
-    Logger.error(`Failed to acquire lock for auto-recharge: ${error}`);
+    logger.error(`Failed to acquire lock for auto-recharge: ${error}`);
     return {
       success: false,
       message: "Failed to acquire lock for auto-recharge",
diff --git a/apps/api/src/services/billing/issue_credits.ts b/apps/api/src/services/billing/issue_credits.ts
@@ -1,9 +1,9 @@
-import { Logger } from "../../lib/logger";
+import { logger } from "../../lib/logger";
 import { supabase_service } from "../supabase";
 
 export async function issueCredits(team_id: string, credits: number) {
   // Add an entry to supabase coupons
-  const { data, error } = await supabase_service.from("coupons").insert({
+  const { error } = await supabase_service.from("coupons").insert({
     team_id: team_id,
     credits: credits,
     status: "active",
@@ -12,7 +12,7 @@ export async function issueCredits(team_id: string, credits: number) {
   });
 
   if (error) {
-    Logger.error(`Error adding coupon: ${error}`);
+    logger.error(`Error adding coupon: ${error}`);
     return false;
   }
 
diff --git a/apps/api/src/services/billing/stripe.ts b/apps/api/src/services/billing/stripe.ts
@@ -1,4 +1,4 @@
-import { Logger } from "../../lib/logger";
+import { logger } from "../../lib/logger";
 import Stripe from "stripe";
 
 const stripe = new Stripe(process.env.STRIPE_SECRET_KEY ?? "");
@@ -18,7 +18,7 @@ export async function createPaymentIntent(
   try {
     const defaultPaymentMethod = await getCustomerDefaultPaymentMethod(customer_id);
     if (!defaultPaymentMethod) {
-      Logger.error(`No default payment method found for customer: ${customer_id}`);
+      logger.error(`No default payment method found for customer: ${customer_id}`);
       return { return_status: "failed", charge_id: "" };
     }
     const paymentIntent = await stripe.paymentIntents.create({
@@ -33,21 +33,21 @@ export async function createPaymentIntent(
     });
 
     if (paymentIntent.status === "succeeded") {
-      Logger.info(`Payment succeeded for team: ${team_id}`);
+      logger.info(`Payment succeeded for team: ${team_id}`);
       return { return_status: "succeeded", charge_id: paymentIntent.id };
     } else if (
       paymentIntent.status === "requires_action" ||
       paymentIntent.status === "processing" ||
       paymentIntent.status === "requires_capture"
     ) {
-      Logger.warn(`Payment requires further action for team: ${team_id}`);
+      logger.warn(`Payment requires further action for team: ${team_id}`);
       return { return_status: "requires_action", charge_id: paymentIntent.id };
     } else {
-      Logger.error(`Payment failed for team: ${team_id}`);
+      logger.error(`Payment failed for team: ${team_id}`);
       return { return_status: "failed", charge_id: paymentIntent.id };
     }
   } catch (error) {
-    Logger.error(
+    logger.error(
       `Failed to create or confirm PaymentIntent for team: ${team_id}`
     );
     console.error(error);
diff --git a/apps/api/src/services/system-monitor.ts b/apps/api/src/services/system-monitor.ts
@@ -2,7 +2,7 @@ import si from 'systeminformation';
 import { Mutex } from "async-mutex";
 import os from 'os';
 import fs from 'fs';
-import { Logger } from '../lib/logger';
+import { logger } from '../lib/logger';
 
 const IS_KUBERNETES = process.env.IS_KUBERNETES === "true";
 
@@ -79,7 +79,7 @@ class SystemMonitor {
 
             return memoryUsagePercentage;
         } catch (error) {
-            Logger.error(`Error calculating memory usage: ${error}`);
+            logger.error(`Error calculating memory usage: ${error}`);
             return 0; // Fallback to 0% usage
         }
     }
@@ -134,7 +134,7 @@ class SystemMonitor {
                 throw new Error('No CPUs found in cpuset.cpus.effective');
             }
         } catch (error) {
-            Logger.warn(`Unable to read cpuset.cpus.effective, defaulting to OS CPUs: ${error}`);
+            logger.warn(`Unable to read cpuset.cpus.effective, defaulting to OS CPUs: ${error}`);
             cpus = os.cpus().map((cpu, index) => index);
         }
         return cpus.length;
@@ -184,7 +184,7 @@ class SystemMonitor {
 
             return cpuUsagePercentage;
         } catch (error) {
-            Logger.error(`Error calculating CPU usage: ${error}`);
+            logger.error(`Error calculating CPU usage: ${error}`);
             return 0; // Fallback to 0% usage
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import si from 'systeminformation';`
`2`	`2`	`import { Mutex } from "async-mutex";`
`3`	`3`	`import os from 'os';`
`4`	`4`	`import fs from 'fs';`
`5`		`-import { Logger } from '../lib/logger';`
	`5`	`+import { logger } from '../lib/logger';`
`6`	`6`
`7`	`7`	`const IS_KUBERNETES = process.env.IS_KUBERNETES === "true";`
`8`	`8`
`@@ -79,7 +79,7 @@ class SystemMonitor {`
`79`	`79`
`80`	`80`	`return memoryUsagePercentage;`
`81`	`81`	`} catch (error) {`
`82`		- Logger.error(`Error calculating memory usage: ${error}`);
	`82`	+ logger.error(`Error calculating memory usage: ${error}`);
`83`	`83`	`return 0; // Fallback to 0% usage`
`84`	`84`	`}`
`85`	`85`	`}`
`@@ -134,7 +134,7 @@ class SystemMonitor {`
`134`	`134`	`throw new Error('No CPUs found in cpuset.cpus.effective');`
`135`	`135`	`}`
`136`	`136`	`} catch (error) {`
`137`		- Logger.warn(`Unable to read cpuset.cpus.effective, defaulting to OS CPUs: ${error}`);
	`137`	+ logger.warn(`Unable to read cpuset.cpus.effective, defaulting to OS CPUs: ${error}`);
`138`	`138`	`cpus = os.cpus().map((cpu, index) => index);`
`139`	`139`	`}`
`140`	`140`	`return cpus.length;`
`@@ -184,7 +184,7 @@ class SystemMonitor {`
`184`	`184`
`185`	`185`	`return cpuUsagePercentage;`
`186`	`186`	`} catch (error) {`
`187`		- Logger.error(`Error calculating CPU usage: ${error}`);
	`187`	+ logger.error(`Error calculating CPU usage: ${error}`);
`188`	`188`	`return 0; // Fallback to 0% usage`
`189`	`189`	`}`
`190`	`190`	`}`