fix: default error dir and loadMidwayController (#1791)

midwayjs · Mar 9, 2022 · 4fd6b64 · 4fd6b64
1 parent c2c757c
commit 4fd6b64
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 13 deletions.
diff --git a/packages/core/src/config/config.default.ts b/packages/core/src/config/config.default.ts
@@ -23,8 +23,7 @@ export default (
         dir: join(logRoot, 'logs', appInfo.name),
         level: isDevelopment ? 'info' : 'warn',
         consoleLevel: isDevelopment ? 'info' : 'warn',
-        auditFileDir: join(logRoot, 'logs', appInfo.name, '.audit'),
-        errorDir: join(logRoot, 'logs', appInfo.name),
+        auditFileDir: '.audit',
       },
       clients: {
         coreLogger: {

diff --git a/packages/core/src/service/loggerService.ts b/packages/core/src/service/loggerService.ts
@@ -1,7 +1,7 @@
 import { Provide, Scope, ScopeEnum, Inject, Init } from '@midwayjs/decorator';
 import { MidwayConfigService } from './configService';
 import { ServiceFactory } from '../common/serviceFactory';
-import { ILogger, loggers } from '@midwayjs/logger';
+import { ILogger, loggers, LoggerOptions } from '@midwayjs/logger';
 import { IMidwayContainer } from '../interface';
 
 @Provide()
@@ -24,7 +24,7 @@ export class MidwayLoggerService extends ServiceFactory<ILogger> {
     );
   }
 
-  protected createClient(config, name?: string) {
+  protected createClient(config: LoggerOptions, name?: string) {
     loggers.createLogger(name, config);
   }
 

diff --git a/packages/info/test/__snapshots__/index.test.ts.snap b/packages/info/test/__snapshots__/index.test.ts.snap
@@ -7,7 +7,7 @@ Object {
     "debug": "{\\"recordConfigMergeOrder\\":true}",
     "info": "{\\"title\\":\\"Midway Info\\",\\"infoPath\\":\\"/_info\\",\\"hiddenKey\\":[\\"k***\\",\\"****\\",\\"*****n\\",\\"********\\",\\"p****\\"]}",
     "keys": "[\\"1*******5\\"]",
-    "midwayLogger": "{\\"default\\":{\\"dir\\":\\"logs\\",\\"level\\":\\"info\\",\\"consoleLevel\\":\\"info\\",\\"auditFileDir\\":\\"logs/.audit\\",\\"errorDir\\":\\"logs\\",\\"disableFile\\":true,\\"disableError\\":true},\\"clients\\":{\\"coreLogger\\":{\\"fileLogName\\":\\"midway-core.log\\"},\\"appLogger\\":{\\"fileLogName\\":\\"midway-app.log\\",\\"aliasName\\":\\"logger\\"}}}",
+    "midwayLogger": "{\\"default\\":{\\"dir\\":\\"logs\\",\\"level\\":\\"info\\",\\"consoleLevel\\":\\"info\\",\\"auditFileDir\\":\\".audit\\",\\"disableFile\\":true,\\"disableError\\":true},\\"clients\\":{\\"coreLogger\\":{\\"fileLogName\\":\\"midway-core.log\\"},\\"appLogger\\":{\\"fileLogName\\":\\"midway-app.log\\",\\"aliasName\\":\\"logger\\"}}}",
     "oss": "{\\"clients\\":{\\"default\\":{\\"accessKeyId\\":\\"123\\",\\"accessKeySecret\\":\\"f*****f\\"}}}",
   },
   "type": "Midway Config",

diff --git a/packages/web/app.js b/packages/web/app.js
@@ -65,6 +65,13 @@ class AppBootHook {
     const eggRouterMiddleware = this.app.router.middleware();
     eggRouterMiddleware._name = 'eggRouterMiddleware';
     this.app.useMiddleware(eggRouterMiddleware);
+
+    if (process.env['EGG_CLUSTER_MODE'] === 'true') {
+      // 多进程时的路由加载必须放在这里，中间件加载之后
+      const framework = this.app.applicationContext.get('midwayWebFramework');
+      await framework.loadMidwayController();
+    }
+
     this.app.emit('application-ready');
   }
 

diff --git a/packages/web/src/base.ts b/packages/web/src/base.ts
@@ -174,11 +174,10 @@ export const createAppWorkerLoader = () => {
             [applicationContext]
           );
 
-          // 执行加载路由
+          // 执行加载框架初始化
           this.framework = await applicationContext.getAsync(
             MidwayWebFramework
           );
-          await this.framework.loadMidwayController();
         });
       }
     }

diff --git a/packages/web/src/logger.ts b/packages/web/src/logger.ts
@@ -1,5 +1,10 @@
-import { loggers, ILogger, IMidwayLogger } from '@midwayjs/logger';
-import { join, isAbsolute } from 'path';
+import {
+  loggers,
+  ILogger,
+  IMidwayLogger,
+  LoggerOptions,
+} from '@midwayjs/logger';
+import { join, isAbsolute, dirname, basename } from 'path';
 import {
   existsSync,
   lstatSync,
@@ -121,7 +126,8 @@ class MidwayLoggers extends Map<string, ILogger> {
     // 先把 egg 的日志配置转为 midway logger 配置
     if (configService.getConfiguration('customLogger')) {
       const eggLoggerConfig = this.transformEggLogger(
-        configService.getConfiguration('customLogger')
+        configService.getConfiguration('customLogger'),
+        configService.getConfiguration('midwayLogger.default')
       ) as any;
       if (eggLoggerConfig) {
         configService.addObject(eggLoggerConfig);
@@ -162,7 +168,6 @@ class MidwayLoggers extends Map<string, ILogger> {
      * 提前备份 egg 日志
      */
     checkEggLoggerExistsAndBackup(options.dir, options.fileLogName);
-
     const logger: ILogger = loggers.createLogger(loggerKey, options);
 
     // overwrite values for pandora collect
@@ -194,18 +199,37 @@ class MidwayLoggers extends Map<string, ILogger> {
     }
   }
 
-  transformEggLogger(eggCustomLogger) {
+  transformEggLogger(eggCustomLogger, midwayLoggerConfig: LoggerOptions) {
     const transformLoggerConfig = {
       midwayLogger: {
         clients: {},
       },
     };
 
     for (const name in eggCustomLogger) {
+      const file = eggCustomLogger[name]?.file;
+      if (!file) {
+        continue;
+      }
+      const options = {} as any;
+      if (isAbsolute(file)) {
+        // 绝对路径，单独处理
+        options.dir = dirname(file);
+        options.fileLogName = basename(file);
+        options.auditFileDir =
+          midwayLoggerConfig.auditFileDir === '.audit'
+            ? join(midwayLoggerConfig.dir, '.audit')
+            : midwayLoggerConfig.auditFileDir;
+        options.errorDir =
+          midwayLoggerConfig.errorDir ?? midwayLoggerConfig.dir;
+      } else {
+        // 相对路径，使用默认的 dir 即可
+        options.fileLogName = file;
+      }
       transformLoggerConfig.midwayLogger.clients[name] = {
-        fileLogName: eggCustomLogger[name]?.file,
         level: levelTransform(eggCustomLogger[name]?.level),
         consoleLevel: levelTransform(eggCustomLogger[name]?.consoleLevel),
+        ...options,
       };
       cleanUndefinedProperty(transformLoggerConfig.midwayLogger.clients[name]);
     }