Skip to content

Commit 47a655f

Browse files
committed
fix: remove logger config in server and http timeout in config
1 parent 6433e1d commit 47a655f

9 files changed

Lines changed: 11 additions & 85 deletions

File tree

jest.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default {
1919
],
2020
],
2121
testMatch: ['**/tests/**/*.test.ts'],
22-
coveragePathIgnorePatterns: ['index.ts', 'src/servers/server.ts'],
22+
coveragePathIgnorePatterns: ['index.ts', 'src/types', 'src/servers/server.ts'],
2323
testResultsProcessor: 'jest-sonar-reporter',
2424
detectOpenHandles: true
2525
}

src/config.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,6 @@ export let config = {
7171
singleLine: Env.getBoolean('LOGGER_PRETTY_SINGLE_LINE', false)
7272
},
7373

74-
http: {
75-
/**
76-
* Timeout for HTTP requests in milliseconds
77-
*/
78-
timeout: Env.getNumber('HTTP_TIMEOUT', 30000)
79-
},
80-
8174
cache: {
8275
/**
8376
* Default TTL (time to live) for cache entries in seconds
@@ -137,12 +130,6 @@ export const defaultServerConfig = {
137130
exposeHeader: true,
138131
generator: () => uuid()
139132
},
140-
logger: {
141-
name: 'express_app',
142-
level: 'info' as LoggerLevels,
143-
prettyPrint: false,
144-
singleLine: false
145-
},
146133
metrics: {
147134
enable: false,
148135
path: '/metrics',

src/servers/server.builder.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -565,27 +565,6 @@ export class ServerConfigBuilder {
565565
return this;
566566
}
567567

568-
/**
569-
* Configures the logger used by the server.
570-
*
571-
* @param opts - Logger configuration options
572-
* @returns The builder instance for chaining
573-
* @default { name: 'express_app', level: 'info', prettyPrint: true in dev, singleLine: false }
574-
*
575-
* @example
576-
* ```typescript
577-
* builder.withLogger({
578-
* level: 'info',
579-
* prettyPrint: true,
580-
* singleLine: false
581-
* })
582-
* ```
583-
*/
584-
withLogger(opts: Partial<NonNullable<ServerConfig['logger']>>): this {
585-
this.mergeConfig('logger', opts as NonNullable<ServerConfig['logger']>);
586-
return this;
587-
}
588-
589568
/**
590569
* Adds a static folder to serve files from.
591570
*

src/servers/server.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import client, { Counter, Histogram } from 'prom-client';
4040
import { NotFoundException } from '../utils/exception.utils';
4141
import fs from 'fs';
4242
import { apiReference } from '@scalar/express-api-reference';
43-
import { defaultServerConfig, setConfig } from '../config';
43+
import { defaultServerConfig } from '../config';
4444
import { deepObjMerge } from '../utils/obj.utils';
4545
import { fileExists } from '../utils/fs.utils';
4646
import { Socket } from 'net';
@@ -174,19 +174,6 @@ export class ExpressServer {
174174
this.healthChecks.push(...config.healthCheck.checks);
175175
}
176176

177-
// Logger
178-
if (this.config.logger) {
179-
const { name, level, prettyPrint: pretty, singleLine } = this.config.logger;
180-
setConfig({
181-
logger: {
182-
name: name ?? 'express_app',
183-
level: level ?? 'info',
184-
pretty: pretty ?? Env.isDev(),
185-
singleLine: singleLine ?? false
186-
}
187-
});
188-
}
189-
190177
// Set global prefix (normalize to empty string or "/prefix" without trailing slash)
191178
this.globalPrefix = this.normalizePath(this.config.globalPrefix ?? '', false);
192179

src/types/server.ts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import { ExpressServer } from '../servers/server';
2727
import { HelmetOptions } from 'helmet';
2828
import { CompressionOptions } from 'compression';
2929
import { CookieParseOptions } from 'cookie-parser';
30-
import { LoggerLevels } from '../utils/logger.utils';
3130
import http from 'http';
3231
import { CorsOptions } from 'cors';
3332
import { ToggleConfig } from '.';
@@ -237,23 +236,6 @@ export interface ServerConfig {
237236
withGlobalPrefix?: boolean;
238237
};
239238

240-
/** Logger settings
241-
* - name: 'express_app'
242-
* - level: 'info'
243-
* - prettyPrint: default true if process.env.NODE_ENV === 'development'
244-
* - singleLine: false
245-
*/
246-
logger?: {
247-
/** Logger name (default: 'express_app') */
248-
name?: string;
249-
/** Log level (default: 'info') */
250-
level?: LoggerLevels;
251-
/** Pretty print (default: true in dev) */
252-
prettyPrint?: boolean;
253-
/** Single line output for pretty print (default: false) */
254-
singleLine?: boolean;
255-
};
256-
257239
/** Prometheus metrics
258240
* - enable: false
259241
* - path: '/metrics'

src/utils/context-store.utils.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,15 @@ export interface Store {
3737
* Add new symbols here to avoid duplication.
3838
*/
3939
export const StoreKeys = {
40-
LOGGER: Symbol('logger'),
41-
REQUEST_ID: Symbol('requestId'),
42-
USER_ID: Symbol('userId'),
43-
TENANT_ID: Symbol('tenantId'),
44-
TRACE_ID: Symbol('traceId'),
45-
CORRELATION_ID: Symbol('correlationId')
40+
LOGGER: Symbol('LOGGER'),
41+
REQUEST_ID: Symbol('REQUEST_ID'),
42+
USER: Symbol('USER'),
43+
SESSION: Symbol('SESSION'),
44+
TRANSACTION_ID: Symbol('TRANSACTION_ID'),
45+
USER_ID: Symbol('USER_ID'),
46+
TENANT_ID: Symbol('TENANT_ID'),
47+
TRACE_ID: Symbol('TRACE_ID'),
48+
CORRELATION_ID: Symbol('CORRELATION_ID')
4649
};
4750

4851
/**

tests/config.test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ describe('config', () => {
105105
},
106106
cache: {
107107
defaultTtl: 3600000
108-
},
109-
http: {
110-
timeout: 30000
111108
}
112109
});
113110
});

tests/servers/server.builder.test.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,6 @@ describe('ServerConfigBuilder', () => {
204204
expect((config as any).cookieParser).toEqual({ decode: expect.any(Function) });
205205
});
206206

207-
it('should configure logger', () => {
208-
const config = new ServerConfigBuilder().withLogger({ level: 'info', prettyPrint: true }).disableOpenApi().build();
209-
expect(config.logger?.level).toBe('info');
210-
expect(config.logger?.prettyPrint).toBe(true);
211-
});
212-
213207
it('should configure microservice', () => {
214208
const config = new ServerConfigBuilder()
215209
.withMicroService({

tests/utils/middleware.utils.test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ jest.mock('../../src/utils/logger.utils', () => ({
2020
jest.mock('../../src/utils/env.utils', () => ({
2121
Env: { isDev: jest.fn() }
2222
}));
23-
jest.mock('../../src/config', () => ({
24-
config: { http: { timeout: 30000 } }
25-
}));
2623
jest.mock('../../src/utils/context-store.utils', () => {
2724
const original = jest.requireActual('../../src/utils/context-store.utils');
2825
return {

0 commit comments

Comments
 (0)