From 2c8d1fb71045dcd241e62b4ee2f1c03ae3690e5b Mon Sep 17 00:00:00 2001 From: Blake Matthes Date: Thu, 27 Mar 2025 21:10:57 -0500 Subject: [PATCH] fix(logger): changes to get the most recent verse aged --- server/services/logger/controller/getLogs.ts | 49 +++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/server/services/logger/controller/getLogs.ts b/server/services/logger/controller/getLogs.ts index ee29071..78bcd52 100644 --- a/server/services/logger/controller/getLogs.ts +++ b/server/services/logger/controller/getLogs.ts @@ -1,28 +1,41 @@ -import {and, eq, inArray, lte, 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, gte, inArray, lte, sql } from "drizzle-orm"; +import { db } from "../../../../database/dbclient.js"; +import { logs } from "../../../../database/schema/logs.js"; +import { createLog } from "../logger.js"; export const getLogs = async (data: any) => { try { // clear all remaining logs ne to info. - const checked = data.checked && data.checked[0] === "true" ? true : false || false; + const checked = + data.checked && data.checked[0] === "true" ? true : false || false; const logData = await db - .select() - .from(logs) - .where( - and( - lte(logs.created_at, sql.raw(`NOW() - INTERVAL '${data.hours} hours'`)), - inArray(logs.service, data.service), - inArray(logs.level, data.level), - eq(logs.checked, checked) - ) - ); + .select() + .from(logs) + .where( + and( + gte( + logs.created_at, + sql.raw(`NOW() - INTERVAL '${data.hours ?? "4"} hours'`) + ), + inArray(logs.service, data.service), + inArray(logs.level, data.level), + eq(logs.checked, checked) + ) + ); - return {success: true, message: "logs returned", data: logData}; + return { success: true, message: "logs returned", data: logData }; } catch (error) { console.log(error); - createLog("error", "lst", "logger", `There was an error deleteing server logs. ${error}`); - return {success: false, message: "An error occured while trying to get the logs", error}; + createLog( + "error", + "lst", + "logger", + `There was an error deleteing server logs. ${error}` + ); + return { + success: false, + message: "An error occured while trying to get the logs", + error, + }; } };