chore(backend): Export Logger class
This commit is contained in:
		
							parent
							
								
									c2e3886f3f
								
							
						
					
					
						commit
						c37d4d8e04
					
				
					 9 changed files with 21 additions and 21 deletions
				
			
		|  | @ -12,10 +12,9 @@ import submissionRouter from './routes/submission.js'; | ||||||
| import classRouter from './routes/class.js'; | import classRouter from './routes/class.js'; | ||||||
| import questionRouter from './routes/question.js'; | import questionRouter from './routes/question.js'; | ||||||
| import loginRouter from './routes/login.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 { responseTimeLogger } from './logging/responseTimeLogger.js'; | ||||||
| import responseTime from 'response-time'; | import responseTime from 'response-time'; | ||||||
| import { Logger } from 'winston'; |  | ||||||
| import { EnvVars, getNumericEnvVar } from './util/envvars.js'; | import { EnvVars, getNumericEnvVar } from './util/envvars.js'; | ||||||
| 
 | 
 | ||||||
| const logger: Logger = getLogger(); | const logger: Logger = getLogger(); | ||||||
|  |  | ||||||
|  | @ -1,11 +1,10 @@ | ||||||
| import fs from 'fs'; | import fs from 'fs'; | ||||||
| import path from 'path'; | import path from 'path'; | ||||||
| import yaml from 'js-yaml'; | import yaml from 'js-yaml'; | ||||||
| import { Logger } from 'winston'; |  | ||||||
| import { Request, Response } from 'express'; | import { Request, Response } from 'express'; | ||||||
| import { themes } from '../data/themes.js'; | import { themes } from '../data/themes.js'; | ||||||
| import { FALLBACK_LANG } from '../config.js'; | import { FALLBACK_LANG } from '../config.js'; | ||||||
| import { getLogger } from '../logging/initalize.js'; | import { getLogger, Logger } from '../logging/initalize.js'; | ||||||
| 
 | 
 | ||||||
| const logger: Logger = getLogger(); | const logger: Logger = getLogger(); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -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 LokiTransport from 'winston-loki'; | ||||||
| import { LokiLabels } from 'loki-logger-ts'; | import { LokiLabels } from 'loki-logger-ts'; | ||||||
| import { LOG_LEVEL, LOKI_HOST } from '../config.js'; | import { LOG_LEVEL, LOKI_HOST } from '../config.js'; | ||||||
| 
 | 
 | ||||||
|  | export class Logger extends WinstonLogger { | ||||||
|  |     constructor() { | ||||||
|  |         super(); | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | 
 | ||||||
| const Labels: LokiLabels = { | const Labels: LokiLabels = { | ||||||
|     source: 'Dwengo-Backend', |     source: 'Dwengo-Backend', | ||||||
|     service: 'API', |     service: 'API', | ||||||
|  |  | ||||||
|  | @ -1,6 +1,5 @@ | ||||||
| import { DefaultLogger, LogContext, LoggerNamespace } from '@mikro-orm/core'; | import { DefaultLogger, LogContext, LoggerNamespace } from '@mikro-orm/core'; | ||||||
| import { Logger } from 'winston'; | import { getLogger, Logger } from './initalize.js'; | ||||||
| import { getLogger } from './initalize.js'; |  | ||||||
| import { LokiLabels } from 'loki-logger-ts'; | import { LokiLabels } from 'loki-logger-ts'; | ||||||
| 
 | 
 | ||||||
| export class MikroOrmLogger extends DefaultLogger { | export class MikroOrmLogger extends DefaultLogger { | ||||||
|  |  | ||||||
|  | @ -1,5 +1,4 @@ | ||||||
| import { getLogger } from './initalize.js'; | import { getLogger, Logger } from './initalize.js'; | ||||||
| import { Logger } from 'winston'; |  | ||||||
| import { Request, Response } from 'express'; | import { Request, Response } from 'express'; | ||||||
| 
 | 
 | ||||||
| export function responseTimeLogger(req: Request, res: Response, time: number) { | export function responseTimeLogger(req: Request, res: Response, time: number) { | ||||||
|  |  | ||||||
|  | @ -1,8 +1,7 @@ | ||||||
| import { EntityManager, MikroORM } from '@mikro-orm/core'; | import { EntityManager, MikroORM } from '@mikro-orm/core'; | ||||||
| import config from './mikro-orm.config.js'; | import config from './mikro-orm.config.js'; | ||||||
| import { EnvVars, getEnvVar } from './util/envvars.js'; | import { EnvVars, getEnvVar } from './util/envvars.js'; | ||||||
| import { getLogger } from './logging/initalize.js'; | import { getLogger, Logger } from './logging/initalize.js'; | ||||||
| import { Logger } from 'winston'; |  | ||||||
| 
 | 
 | ||||||
| let orm: MikroORM | undefined; | let orm: MikroORM | undefined; | ||||||
| export async function initORM(testingMode: boolean = false) { | export async function initORM(testingMode: boolean = false) { | ||||||
|  |  | ||||||
|  | @ -7,8 +7,7 @@ import { | ||||||
|     LearningPathResponse, |     LearningPathResponse, | ||||||
| } from '../interfaces/learningPath.js'; | } from '../interfaces/learningPath.js'; | ||||||
| import { fetchLearningPaths } from './learningPaths.js'; | import { fetchLearningPaths } from './learningPaths.js'; | ||||||
| import { getLogger } from '../logging/initalize.js'; | import { getLogger, Logger } from '../logging/initalize.js'; | ||||||
| import { Logger } from 'winston'; |  | ||||||
| 
 | 
 | ||||||
| const logger: Logger = getLogger(); | const logger: Logger = getLogger(); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,11 +1,7 @@ | ||||||
| import { fetchWithLogging } from '../util/apiHelper.js'; | import { fetchWithLogging } from '../util/apiHelper.js'; | ||||||
| import { DWENGO_API_BASE } from '../config.js'; | import { DWENGO_API_BASE } from '../config.js'; | ||||||
| import { | import { LearningPath, LearningPathResponse } from '../interfaces/learningPath.js'; | ||||||
|     LearningPath, | import { getLogger, Logger } from '../logging/initalize.js'; | ||||||
|     LearningPathResponse, |  | ||||||
| } from '../interfaces/learningPath.js'; |  | ||||||
| import { getLogger } from '../logging/initalize.js'; |  | ||||||
| import { Logger } from 'winston'; |  | ||||||
| 
 | 
 | ||||||
| const logger: Logger = getLogger(); | const logger: Logger = getLogger(); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,6 +1,5 @@ | ||||||
| import axios, { AxiosRequestConfig } from 'axios'; | import axios, { AxiosRequestConfig } from 'axios'; | ||||||
| import { getLogger } from '../logging/initalize.js'; | import { getLogger, Logger } from '../logging/initalize.js'; | ||||||
| import { Logger } from 'winston'; |  | ||||||
| 
 | 
 | ||||||
| const logger: Logger = getLogger(); | const logger: Logger = getLogger(); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Reference in a new issue