IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-03-01 12:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

additional logs

Browse Source
This commit is contained in:
Claus-Peter Hübner 2022-05-06 03:08:28 +02:00
parent 55abc315ef
commit 1be08cc7e1
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/server/createServer.ts
View File

@ -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<ServerDef> => {
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<ServerDef> =>
// 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<ServerDef> =>
logger,
})
apollo.applyMiddleware({ app, path: '/' })
logger.trace('createServer...successful')
logger.debug('createServer...successful')
return { apollo, app, con }
}

10
backend/src/typeorm/DBVersion.ts
View File

@ -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<string | null> => {
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<string | null> => {
const checkDBVersion = async (DB_VERSION: string): Promise<boolean> => {
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'
}`,