From 4b504288a9c93d95a8be206f8e11787ab88bf29e Mon Sep 17 00:00:00 2001 From: xangelo Date: Thu, 5 Dec 2024 13:51:04 -0500 Subject: [PATCH] chore(logs): swap remaining console.log for logger --- src/server/api.ts | 2 +- src/server/auth.ts | 12 +++++++----- src/server/fight.ts | 2 -- src/server/player.ts | 1 - src/server/routes/inventory.ts | 3 ++- src/server/tracing.ts | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/server/api.ts b/src/server/api.ts index 53071cd..be5e89a 100644 --- a/src/server/api.ts +++ b/src/server/api.ts @@ -456,7 +456,7 @@ async function loginHandler (req: Request, res: Response) { res.sendStatus(204); } catch(e) { - console.log(e); + logger.error(e); res.send(Alert.ErrorAlert('That user doesn\'t exist')); } } diff --git a/src/server/auth.ts b/src/server/auth.ts index c341a40..bf5e240 100644 --- a/src/server/auth.ts +++ b/src/server/auth.ts @@ -22,20 +22,22 @@ export async function signup(playerId: string, username: string, password: strin return; } else { - console.log(res); + logger.error(res); throw new Error('Something weird happened..'); } } catch(e) { - console.log(e); if(e?.code === '23505') { if(e?.constraint === 'auth_pkey') { - console.log(`Key ${playerId} was already claimed. ${data.username} tried claiming again..`); + logger.info(`Key ${playerId} was already claimed. ${data.username} tried claiming again..`); } // someone already claimed this key throw new Error('Invalid account'); } + else { + logger.error(e); + } } } @@ -63,7 +65,7 @@ export async function login(username: string, password: string): Promise export async function authEndpoint(req: Request, res: Response, next: any) { const authToken = req.headers['x-authtoken']; if(!authToken) { - console.log(`Invalid auth token ${authToken}`); + logger.error(`Invalid auth token ${authToken}`); res.sendStatus(401) } else { @@ -78,7 +80,7 @@ export async function authEndpoint(req: Request, res: Response, next: any) { next() } else { - console.log(`Invalid auth token ${authToken}`); + logger.error(`Invalid auth token ${authToken}`); res.sendStatus(401); } } diff --git a/src/server/fight.ts b/src/server/fight.ts index af8c644..dda4a7a 100644 --- a/src/server/fight.ts +++ b/src/server/fight.ts @@ -98,8 +98,6 @@ async function increaseEquipmentLevel( }; return { ...item, boosts: updatedBoosts, level: newLevel }; }); - - console.log(updatedInventory); } export async function fightRound( diff --git a/src/server/player.ts b/src/server/player.ts index 813e51d..36910ac 100644 --- a/src/server/player.ts +++ b/src/server/player.ts @@ -139,7 +139,6 @@ export async function changeProfession(player_id: string, newProfession: Profess }); } catch(e) { - console.log(e); const res = await db.first().select('*').from('profession_levels').where({ player_id, profession: newProfession diff --git a/src/server/routes/inventory.ts b/src/server/routes/inventory.ts index 8af4557..2fc90d3 100644 --- a/src/server/routes/inventory.ts +++ b/src/server/routes/inventory.ts @@ -13,6 +13,7 @@ import { EquipmentSlot } from '../../shared/inventory'; import { PlayerItem } from '../../shared/items'; import { maxHp } from '../../shared/player'; import { HealthPotionSmall } from '../../shared/items/health_potion'; +import { logger } from '@server/lib/logger'; export const inventoryRouter = Router(); @@ -96,7 +97,7 @@ inventoryRouter.put('/item/:item_id', authEndpoint, async (req: Request, res: Re const item: PlayerItem = await getItemFromPlayer(req.player.id, parseInt(req.params.item_id)); if(!item) { - console.log(`Can't find item [${req.params.item_id}]`); + logger.error(`Can't find item [${req.params.item_id}]`); return; } diff --git a/src/server/tracing.ts b/src/server/tracing.ts index fae01ca..2339dbb 100644 --- a/src/server/tracing.ts +++ b/src/server/tracing.ts @@ -1,7 +1,7 @@ import { config as dotenv } from 'dotenv'; import { HoneycombSDK } from '@honeycombio/opentelemetry-node'; import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'; - +import { logger } from '@server/lib/logger'; dotenv(); const sdk = new HoneycombSDK({ @@ -20,9 +20,9 @@ if(process.env.OTEL_ENABLED) { export function s() { if(process.env.OTEL_ENABLED) { - console.log('OTEL Started'); + logger.info('OTEL Started'); } else { - console.log('OTEL disabled'); + logger.info('OTEL disabled'); } } -- 2.25.1