diff --git a/server/services/logger/controller/logCleanup.ts b/server/services/logger/controller/logCleanup.ts index 9571d87..680cb51 100644 --- a/server/services/logger/controller/logCleanup.ts +++ b/server/services/logger/controller/logCleanup.ts @@ -1,7 +1,7 @@ -import {and, eq, inArray, lte, ne, sql} from "drizzle-orm"; -import {db} from "../../../../database/dbclient.js"; -import {logs} from "../../../../database/schema/logs.js"; -import {createLog} from "../logger.js"; +import { and, eq, inArray, lte, ne, sql } from "drizzle-orm"; +import { db } from "../../../../database/dbclient.js"; +import { logs } from "../../../../database/schema/logs.js"; +import { createLog } from "../logger.js"; export const logCleanup = async () => { /** @@ -12,15 +12,15 @@ export const logCleanup = async () => { try { // clear info logs older than 3 days const delLogs = await db - .delete(logs) - .where( - and( - lte(logs.created_at, sql`NOW() - INTERVAL '3 days'`), - inArray(logs.service, ["server", "tcp", "sqlProd", "globalutils"]), - eq(logs.level, "30") + .delete(logs) + .where( + and( + lte(logs.created_at, sql`NOW() - INTERVAL '3 days'`), + //inArray(logs.service, ["server", "tcp", "sqlProd", "globalutils","notify", "logger", "serverupdater"]), + eq(logs.level, "info") + ) ) - ) - .returning({name: logs.message}); + .returning({ name: logs.message }); createLog( "info", "lst", @@ -28,21 +28,26 @@ export const logCleanup = async () => { `${delLogs.length} Server logs were just deleted that were older than 3 days` ); } catch (error) { - createLog("error", "lst", "logger", `There was an error deleteing server logs. ${error}`); + createLog( + "error", + "lst", + "logger", + `There was an error deleteing server logs. ${error}` + ); } try { // clear all remaining logs ne to info. const delLogs = await db - .delete(logs) - .where( - and( - lte(logs.created_at, sql`NOW() - INTERVAL '7 days'`), - inArray(logs.service, ["server", "tcp", "sqlProd", "globalutils"]), - ne(logs.level, "30") + .delete(logs) + .where( + and( + lte(logs.created_at, sql`NOW() - INTERVAL '7 days'`), + //inArray(logs.service, ["server", "tcp", "sqlProd", "globalutils", "notify", "logger", "serverupdater"]), + ne(logs.level, "info") + ) ) - ) - .returning({name: logs.message}); + .returning({ name: logs.message }); createLog( "info", "lst", @@ -50,6 +55,11 @@ export const logCleanup = async () => { `${delLogs.length} Server logs were just deleted that were older than 7 days` ); } catch (error) { - createLog("error", "lst", "logger", `There was an error deleteing server logs. ${error}`); + createLog( + "error", + "lst", + "logger", + `There was an error deleteing server logs. ${error}` + ); } };