diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index c9c4b710c..895a16dd4 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -30,8 +30,9 @@ type ServerDef = { apollo: ApolloServer; app: Express; con: Connection } // eslint-disable-next-line @typescript-eslint/no-explicit-any const createServer = async (context: any = serverContext): Promise => { - const logger = log4js.getLogger('server.createServer') - logger.trace('createServer...') + const logger = log4js.getLogger('backend.server.createServer') + logger.addContext('user', 'unknown') + logger.debug('createServer...') // open mysql connection const con = await connection() @@ -43,12 +44,7 @@ const createServer = async (context: any = serverContext): Promise => // check for correct database version const dbVersion = await checkDBVersion(CONFIG.DB_VERSION) if (!dbVersion) { - logger.fatal( - 'Missmatching Database Versions! configured=' + - CONFIG.DB_VERSION + - ', dbVersion=' + - dbVersion, - ) + logger.fatal('Fatal: Database Version incorrect') throw new Error('Fatal: Database Version incorrect') } @@ -76,7 +72,7 @@ const createServer = async (context: any = serverContext): Promise => logger, }) apollo.applyMiddleware({ app, path: '/' }) - logger.trace('createServer...successful') + logger.debug('createServer...successful') return { apollo, app, con } } diff --git a/backend/src/typeorm/DBVersion.ts b/backend/src/typeorm/DBVersion.ts index a8cb70489..94d17007a 100644 --- a/backend/src/typeorm/DBVersion.ts +++ b/backend/src/typeorm/DBVersion.ts @@ -1,12 +1,15 @@ import { Migration } from '@entity/Migration' +import log4js from '@/server/logger' + +const logger = log4js.getLogger('backend.DBVersion') +logger.addContext('user', 'unknown') const getDBVersion = async (): Promise => { try { const dbVersion = await Migration.findOne({ order: { version: 'DESC' } }) return dbVersion ? dbVersion.fileName : null } catch (error) { - // eslint-disable-next-line no-console - console.log(error) + logger.error(error) return null } } @@ -14,8 +17,7 @@ const getDBVersion = async (): Promise => { const checkDBVersion = async (DB_VERSION: string): Promise => { const dbVersion = await getDBVersion() if (!dbVersion || dbVersion.indexOf(DB_VERSION) === -1) { - // eslint-disable-next-line no-console - console.log( + logger.error( `Wrong database version detected - the backend requires '${DB_VERSION}' but found '${ dbVersion || 'None' }`,