From a31c0470917ca9c1f00a743c67de3b257bfd027b Mon Sep 17 00:00:00 2001 From: zlm Date: Wed, 10 Jun 2026 15:23:20 +0800 Subject: [PATCH] fix: flush log stream before exit in shutdown --- project/src/index.ts | 16 ++++++++++++---- project/src/logger.ts | 10 ++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/project/src/index.ts b/project/src/index.ts index 2d64e5d..b3cc1a5 100644 --- a/project/src/index.ts +++ b/project/src/index.ts @@ -6,6 +6,8 @@ import configApi from './api/config.js' import queryApi from './api/query.js' import monitorApi from './api/monitor.js' import { ensureDatabase } from './database/schema.js' +import { closeDb } from './database/connection.js' +import { flushLog } from './logger.js' import * as scanner from './plc/scanner.js' import fs from 'fs' import path from 'path' @@ -63,11 +65,13 @@ app.get('/web/*', (c) => { return c.newResponse(content, 200, { 'Content-Type': MIME[ext] || 'application/octet-stream' }) }) -app.get('/api/shutdown', (c) => { +app.get('/api/shutdown', async (c) => { logger.info('Server', '收到关闭请求,正在停止...') scanner.stop() - setTimeout(() => { + setTimeout(async () => { server.close() + await flushLog() + closeDb() process.exit(0) }, 500) return c.json({ success: true, message: '正在关闭' }) @@ -95,12 +99,16 @@ try { logger.error('Server', '初始化失败', err) } -process.on('SIGINT', () => { +process.on('SIGINT', async () => { scanner.stop() + await flushLog() + closeDb() process.exit(0) }) -process.on('SIGTERM', () => { +process.on('SIGTERM', async () => { scanner.stop() + await flushLog() + closeDb() process.exit(0) }) diff --git a/project/src/logger.ts b/project/src/logger.ts index 88eb6c7..fcf4002 100644 --- a/project/src/logger.ts +++ b/project/src/logger.ts @@ -101,6 +101,16 @@ function log(level: LogLevel, tag: string, msg: string, ...args: any[]) { } } +export function flushLog(): Promise { + return new Promise(resolve => { + if (logStream) { + logStream.end(resolve) + } else { + resolve() + } + }) +} + cleanup() export const logger = {