From 8f39907144260109606413d153662ec6dd5be518 Mon Sep 17 00:00:00 2001 From: malteish Date: Tue, 16 Jul 2024 14:03:26 +0200 Subject: [PATCH] remove winston from backend --- packages/backend/src/index.ts | 12 ------------ packages/backend/src/persistence/getDatabase.ts | 6 +++--- .../src/persistence/session/setAccount.test.ts | 5 ----- packages/backend/src/profile.test.ts | 5 ----- packages/backend/src/profile.ts | 8 ++++---- packages/backend/src/storage.test.ts | 5 ----- 6 files changed, 7 insertions(+), 34 deletions(-) diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index aa2436ea3..3fc9ef1bc 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -13,7 +13,6 @@ import 'dotenv/config'; import express from 'express'; import http from 'http'; import path from 'path'; -import winston from 'winston'; import { getDatabase } from './persistence/getDatabase'; import Profile from './profile'; import Storage from './storage'; @@ -28,17 +27,6 @@ const server = http.createServer(app); app.use(cors()); app.use(bodyParser.json()); -declare global { - var logger: winston.Logger; -} - -global.logger = winston.createLogger({ - level: process.env.LOG_LEVEL ?? 'info', - transports: [new winston.transports.Console()], -}); - -winston.loggers.add('default', global.logger); - (async () => { const db = await getDatabase(); const web3Provider = await getCachedWebProvider(process.env); diff --git a/packages/backend/src/persistence/getDatabase.ts b/packages/backend/src/persistence/getDatabase.ts index 373c98c03..54253708f 100644 --- a/packages/backend/src/persistence/getDatabase.ts +++ b/packages/backend/src/persistence/getDatabase.ts @@ -39,11 +39,11 @@ export async function getRedisClient() { ); client.on('error', (err) => { - global.logger.error('Redis error: ' + (err as Error).message); + console.error('Redis error: ' + (err as Error).message); }); - client.on('reconnecting', () => global.logger.info('Redis reconnection')); - client.on('ready', () => global.logger.info('Redis ready')); + client.on('reconnecting', () => console.info('Redis reconnection')); + client.on('ready', () => console.info('Redis ready')); await client.connect(); diff --git a/packages/backend/src/persistence/session/setAccount.test.ts b/packages/backend/src/persistence/session/setAccount.test.ts index fee3f90e4..2e333d730 100644 --- a/packages/backend/src/persistence/session/setAccount.test.ts +++ b/packages/backend/src/persistence/session/setAccount.test.ts @@ -1,14 +1,9 @@ import { Redis, IDatabase, getRedisClient, getDatabase } from '../getDatabase'; import { UserProfile } from '@dm3-org/dm3-lib-profile'; import { Session } from '@dm3-org/dm3-lib-delivery'; -import winston from 'winston'; const USER_ADDRESS = '0x25A643B6e52864d0eD816F1E43c0CF49C83B8292'; -global.logger = winston.createLogger({ - transports: [new winston.transports.Console()], -}); - describe('Set Session', () => { let redisClient: Redis; let db: IDatabase; diff --git a/packages/backend/src/profile.test.ts b/packages/backend/src/profile.test.ts index af4445c25..936dc696c 100644 --- a/packages/backend/src/profile.test.ts +++ b/packages/backend/src/profile.test.ts @@ -13,15 +13,10 @@ import { ethers } from 'ethers'; import express from 'express'; import http from 'http'; import request from 'supertest'; -import winston from 'winston'; import { IDatabase } from './persistence/getDatabase'; import profile from './profile'; import storage from './storage'; -global.logger = winston.createLogger({ - transports: [new winston.transports.Console()], -}); - const web3ProviderMock: ethers.providers.JsonRpcProvider = new ethers.providers.JsonRpcProvider(); diff --git a/packages/backend/src/profile.ts b/packages/backend/src/profile.ts index 012667d71..b15139ea4 100644 --- a/packages/backend/src/profile.ts +++ b/packages/backend/src/profile.ts @@ -40,11 +40,11 @@ export default ( ); if (!schemaIsValid) { - global.logger.error({ message: 'invalid schema' }); + console.error({ message: 'invalid schema' }); return res.status(400).send({ error: 'invalid schema' }); } const ensName = normalizeEnsName(req.params.ensName); - global.logger.debug({ + console.debug({ method: 'POST', url: req.url, ensName, @@ -60,7 +60,7 @@ export default ( req.body, serverSecret, ); - global.logger.debug({ + console.debug({ message: 'POST profile', ensName, data, @@ -68,7 +68,7 @@ export default ( res.json(data); } catch (e) { - global.logger.warn({ + console.warn({ message: 'POST profile', error: JSON.stringify(e), }); diff --git a/packages/backend/src/storage.test.ts b/packages/backend/src/storage.test.ts index be4bafcb3..f02925ab9 100644 --- a/packages/backend/src/storage.test.ts +++ b/packages/backend/src/storage.test.ts @@ -17,7 +17,6 @@ import bodyParser from 'body-parser'; import { ethers } from 'ethers'; import express from 'express'; import request from 'supertest'; -import winston from 'winston'; import { IDatabase, Redis, @@ -45,10 +44,6 @@ const keysA = { const serverSecret = 'veryImportantSecretToGenerateAndValidateJSONWebTokens'; -global.logger = winston.createLogger({ - transports: [new winston.transports.Console()], -}); - describe('Storage', () => { let app; let token = generateAuthJWT('bob.eth', serverSecret);