diff --git a/backend/src/app.ts b/backend/src/app.ts index 2161666f..652c27d1 100644 --- a/backend/src/app.ts +++ b/backend/src/app.ts @@ -12,10 +12,9 @@ import submissionRouter from './routes/submission.js'; import classRouter from './routes/class.js'; import questionRouter from './routes/question.js'; import loginRouter from './routes/login.js'; -import { getLogger } from './logging/initalize.js'; +import { getLogger, Logger } from './logging/initalize.js'; import { responseTimeLogger } from './logging/responseTimeLogger.js'; import responseTime from 'response-time'; -import { Logger } from 'winston'; import { EnvVars, getNumericEnvVar } from './util/envvars.js'; const logger: Logger = getLogger(); diff --git a/backend/src/controllers/themes.ts b/backend/src/controllers/themes.ts index c10f1b98..e60502ed 100644 --- a/backend/src/controllers/themes.ts +++ b/backend/src/controllers/themes.ts @@ -1,11 +1,10 @@ import fs from 'fs'; import path from 'path'; import yaml from 'js-yaml'; -import { Logger } from 'winston'; import { Request, Response } from 'express'; import { themes } from '../data/themes.js'; import { FALLBACK_LANG } from '../config.js'; -import { getLogger } from '../logging/initalize.js'; +import { getLogger, Logger } from '../logging/initalize.js'; const logger: Logger = getLogger(); diff --git a/backend/src/logging/initalize.ts b/backend/src/logging/initalize.ts index 5da786fe..18166408 100644 --- a/backend/src/logging/initalize.ts +++ b/backend/src/logging/initalize.ts @@ -1,8 +1,19 @@ -import { createLogger, format, Logger, transports } from 'winston'; +import { + createLogger, + format, + Logger as WinstonLogger, + transports, +} from 'winston'; import LokiTransport from 'winston-loki'; import { LokiLabels } from 'loki-logger-ts'; import { LOG_LEVEL, LOKI_HOST } from '../config.js'; +export class Logger extends WinstonLogger { + constructor() { + super(); + } +} + const Labels: LokiLabels = { source: 'Dwengo-Backend', service: 'API', diff --git a/backend/src/logging/mikroOrmLogger.ts b/backend/src/logging/mikroOrmLogger.ts index 49818427..e8bc1fad 100644 --- a/backend/src/logging/mikroOrmLogger.ts +++ b/backend/src/logging/mikroOrmLogger.ts @@ -1,6 +1,5 @@ import { DefaultLogger, LogContext, LoggerNamespace } from '@mikro-orm/core'; -import { Logger } from 'winston'; -import { getLogger } from './initalize.js'; +import { getLogger, Logger } from './initalize.js'; import { LokiLabels } from 'loki-logger-ts'; export class MikroOrmLogger extends DefaultLogger { diff --git a/backend/src/logging/responseTimeLogger.ts b/backend/src/logging/responseTimeLogger.ts index 85723e5e..c1bb1e33 100644 --- a/backend/src/logging/responseTimeLogger.ts +++ b/backend/src/logging/responseTimeLogger.ts @@ -1,5 +1,4 @@ -import { getLogger } from './initalize.js'; -import { Logger } from 'winston'; +import { getLogger, Logger } from './initalize.js'; import { Request, Response } from 'express'; export function responseTimeLogger(req: Request, res: Response, time: number) { diff --git a/backend/src/orm.ts b/backend/src/orm.ts index 2205fe89..88decd92 100644 --- a/backend/src/orm.ts +++ b/backend/src/orm.ts @@ -1,8 +1,7 @@ import { EntityManager, MikroORM } from '@mikro-orm/core'; import config from './mikro-orm.config.js'; import { EnvVars, getEnvVar } from './util/envvars.js'; -import { getLogger } from './logging/initalize.js'; -import { Logger } from 'winston'; +import { getLogger, Logger } from './logging/initalize.js'; let orm: MikroORM | undefined; export async function initORM(testingMode: boolean = false) { diff --git a/backend/src/services/learningObjects.ts b/backend/src/services/learningObjects.ts index 90370fe6..709c3298 100644 --- a/backend/src/services/learningObjects.ts +++ b/backend/src/services/learningObjects.ts @@ -7,8 +7,7 @@ import { LearningPathResponse, } from '../interfaces/learningPath.js'; import { fetchLearningPaths } from './learningPaths.js'; -import { getLogger } from '../logging/initalize.js'; -import { Logger } from 'winston'; +import { getLogger, Logger } from '../logging/initalize.js'; const logger: Logger = getLogger(); diff --git a/backend/src/services/learningPaths.ts b/backend/src/services/learningPaths.ts index 7c445806..58703215 100644 --- a/backend/src/services/learningPaths.ts +++ b/backend/src/services/learningPaths.ts @@ -1,11 +1,7 @@ import { fetchWithLogging } from '../util/apiHelper.js'; import { DWENGO_API_BASE } from '../config.js'; -import { - LearningPath, - LearningPathResponse, -} from '../interfaces/learningPath.js'; -import { getLogger } from '../logging/initalize.js'; -import { Logger } from 'winston'; +import { LearningPath, LearningPathResponse } from '../interfaces/learningPath.js'; +import { getLogger, Logger } from '../logging/initalize.js'; const logger: Logger = getLogger(); diff --git a/backend/src/util/apiHelper.ts b/backend/src/util/apiHelper.ts index 4a1cae7f..09492615 100644 --- a/backend/src/util/apiHelper.ts +++ b/backend/src/util/apiHelper.ts @@ -1,6 +1,5 @@ import axios, { AxiosRequestConfig } from 'axios'; -import { getLogger } from '../logging/initalize.js'; -import { Logger } from 'winston'; +import { getLogger, Logger } from '../logging/initalize.js'; const logger: Logger = getLogger();