diff --git a/apps/server/src/api.ts b/apps/server/src/api.ts index b29b0dea..29ff6d37 100644 --- a/apps/server/src/api.ts +++ b/apps/server/src/api.ts @@ -11,10 +11,10 @@ import { filesRouter } from '@/routes/files'; import { nodesRouter } from '@/routes/nodes'; import { syncRouter } from '@/routes/sync'; import { workspacesRouter } from '@/routes/workspaces'; -import { logService } from '@/services/log-service'; import { synapse } from '@/services/synapse-service'; +import { createLogger } from '@/lib/logger'; -const logger = logService.createLogger('api'); +const logger = createLogger('api'); export const initApi = async () => { const app = express(); diff --git a/apps/server/src/lib/logger.ts b/apps/server/src/lib/logger.ts new file mode 100644 index 00000000..70c213c4 --- /dev/null +++ b/apps/server/src/lib/logger.ts @@ -0,0 +1,24 @@ +import pino, { Level } from 'pino'; + +import { host } from '@/host'; + +const logConfig: Record = { + api: 'trace', + 'synapse-service': 'trace', +}; + +export const createLogger = (name: string) => { + return pino({ + name, + level: logConfig[name] || 'trace', + transport: + host.environment === 'development' + ? { + target: 'pino-pretty', + options: { + colorize: true, + }, + } + : undefined, + }); +}; diff --git a/apps/server/src/services/log-service.ts b/apps/server/src/services/log-service.ts deleted file mode 100644 index 54fe975a..00000000 --- a/apps/server/src/services/log-service.ts +++ /dev/null @@ -1,28 +0,0 @@ -import pino, { Level } from 'pino'; - -import { host } from '@/host'; - -const logConfig: Record = { - api: 'trace', - 'synapse-service': 'trace', -}; - -class LogService { - public createLogger(name: string) { - return pino({ - name, - level: logConfig[name] || 'trace', - transport: - host.environment === 'development' - ? { - target: 'pino-pretty', - options: { - colorize: true, - }, - } - : undefined, - }); - } -} - -export const logService = new LogService(); diff --git a/apps/server/src/services/node-service.ts b/apps/server/src/services/node-service.ts index c11bfdb8..6a832bf4 100644 --- a/apps/server/src/services/node-service.ts +++ b/apps/server/src/services/node-service.ts @@ -21,7 +21,7 @@ import { } from '@/data/schema'; import { eventBus } from '@/lib/event-bus'; import { fetchNodeAncestors, mapNode } from '@/lib/nodes'; -import { logService } from '@/services/log-service'; +import { createLogger } from '@/lib/logger'; import { ApplyNodeCreateTransactionInput, ApplyNodeCreateTransactionOutput, @@ -49,7 +49,7 @@ type CollaboratorChangeResult = { }; class NodeService { - private readonly logger = logService.createLogger('node-service'); + private readonly logger = createLogger('node-service'); public async createNode( input: CreateNodeInput diff --git a/apps/server/src/services/synapse-service.ts b/apps/server/src/services/synapse-service.ts index cbe106dc..8affcfba 100644 --- a/apps/server/src/services/synapse-service.ts +++ b/apps/server/src/services/synapse-service.ts @@ -6,7 +6,7 @@ import { NodeTransactionsBatchMessage, NodeType, } from '@colanode/core'; -import { WebSocket,WebSocketServer } from 'ws'; +import { WebSocket, WebSocketServer } from 'ws'; import { Server } from 'http'; @@ -20,7 +20,6 @@ import { } from '@/lib/nodes'; import { verifyToken } from '@/lib/tokens'; import { interactionService } from '@/services/interaction-service'; -import { logService } from '@/services/log-service'; import { CollaboratorAddedEvent, CollaboratorRemovedEvent, @@ -29,6 +28,7 @@ import { NodeDeletedEvent, NodeUpdatedEvent, } from '@/types/events'; +import { createLogger } from '@/lib/logger'; interface SynapseUserCursor { workspaceId: string; @@ -50,7 +50,7 @@ interface SynapseConnection { const PUBLIC_NODES: NodeType[] = ['workspace', 'user']; class SynapseService { - private readonly logger = logService.createLogger('synapse-service'); + private readonly logger = createLogger('synapse-service'); private readonly connections: Map = new Map(); constructor() {