fix: flush log stream before exit in shutdown
This commit is contained in:
1 parent
5d5cd25cf5
commit
a31c047091
2 files changed
+22
-4
No files matched your search
+12
-4
@@ -6,6 +6,8 @@ import configApi from './api/config.js'
|
|||||||
import queryApi from './api/query.js'
|
import queryApi from './api/query.js'
|
||||||
import monitorApi from './api/monitor.js'
|
import monitorApi from './api/monitor.js'
|
||||||
import { ensureDatabase } from './database/schema.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 * as scanner from './plc/scanner.js'
|
||||||
import fs from 'fs'
|
import fs from 'fs'
|
||||||
import path from 'path'
|
import path from 'path'
|
||||||
@@ -63,11 +65,13 @@ app.get('/web/*', (c) => {
|
|||||||
return c.newResponse(content, 200, { 'Content-Type': MIME[ext] || 'application/octet-stream' })
|
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', '收到关闭请求,正在停止...')
|
logger.info('Server', '收到关闭请求,正在停止...')
|
||||||
scanner.stop()
|
scanner.stop()
|
||||||
setTimeout(() => {
|
setTimeout(async () => {
|
||||||
server.close()
|
server.close()
|
||||||
|
await flushLog()
|
||||||
|
closeDb()
|
||||||
process.exit(0)
|
process.exit(0)
|
||||||
}, 500)
|
}, 500)
|
||||||
return c.json({ success: true, message: '正在关闭' })
|
return c.json({ success: true, message: '正在关闭' })
|
||||||
@@ -95,12 +99,16 @@ try {
|
|||||||
logger.error('Server', '初始化失败', err)
|
logger.error('Server', '初始化失败', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
process.on('SIGINT', () => {
|
process.on('SIGINT', async () => {
|
||||||
scanner.stop()
|
scanner.stop()
|
||||||
|
await flushLog()
|
||||||
|
closeDb()
|
||||||
process.exit(0)
|
process.exit(0)
|
||||||
})
|
})
|
||||||
|
|
||||||
process.on('SIGTERM', () => {
|
process.on('SIGTERM', async () => {
|
||||||
scanner.stop()
|
scanner.stop()
|
||||||
|
await flushLog()
|
||||||
|
closeDb()
|
||||||
process.exit(0)
|
process.exit(0)
|
||||||
})
|
})
|
||||||
@@ -101,6 +101,16 @@ function log(level: LogLevel, tag: string, msg: string, ...args: any[]) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function flushLog(): Promise<void> {
|
||||||
|
return new Promise(resolve => {
|
||||||
|
if (logStream) {
|
||||||
|
logStream.end(resolve)
|
||||||
|
} else {
|
||||||
|
resolve()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
cleanup()
|
cleanup()
|
||||||
|
|
||||||
export const logger = {
|
export const logger = {
|
||||||
|
|||||||
Reference in new issue
Block a user