chore: attach log level to exceptions

koishijs · Jan 13, 2020 · a17867b · a17867b
1 parent 750b1d1
commit a17867b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/packages/koishi-cli/src/index.ts b/packages/koishi-cli/src/index.ts
@@ -1,5 +1,6 @@
 export * from 'koishi-core'
 export * from 'koishi-utils'
+export { AppConfig } from './worker'
 
 const { version } = require('../package')
 export { version }
diff --git a/packages/koishi-cli/src/run.ts b/packages/koishi-cli/src/run.ts
@@ -14,8 +14,6 @@ function createWorker () {
   child.on('message', (data: any) => {
     if (data.type === 'start') {
       started = true
-    } else if (data.type === 'error') {
-      logger.error(data.message)
     }
   })
 

diff --git a/packages/koishi-cli/src/worker.ts b/packages/koishi-cli/src/worker.ts
@@ -10,13 +10,14 @@ import { safeLoad } from 'js-yaml'
 
 const { version } = require('../package')
 
+let baseLogLevel = 3
+if (process.env.KOISHI_LOG_LEVEL !== undefined) {
+  baseLogLevel = +process.env.KOISHI_LOG_LEVEL
+}
+
 process.on('uncaughtException', ({ message }) => {
-  process.send({
-    type: 'error',
-    message,
-  }, () => {
-    process.exit(-1)
-  })
+  logger.error(message, baseLogLevel)
+  process.exit(-1)
 })
 
 const cwd = process.cwd()
@@ -98,11 +99,6 @@ if (['.js', '.json'].includes(extension)) {
 
 if (!config) throw new Error('config file not found.')
 
-let baseLogLevel = 3
-if (process.env.KOISHI_LOG_LEVEL !== undefined) {
-  baseLogLevel = +process.env.KOISHI_LOG_LEVEL
-}
-
 if (Array.isArray(config)) {
   config.forEach(conf => prepareApp(conf))
 } else {
@@ -150,6 +146,6 @@ appList.forEach((app) => {
 })
 
 startAll().catch((error) => {
-  logger.error(error)
+  logger.error(error, baseLogLevel)
   process.exit(-1)
 })