fix: createLogger & commond-core support multi provider (#604)

midwayjs · Aug 18, 2020 · c1748f0 · c1748f0
1 parent 3e874a2
commit c1748f0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/packages/faas-cli-command-core/src/core.ts b/packages/faas-cli-command-core/src/core.ts
@@ -79,6 +79,11 @@ export class CommandHookCore implements ICommandHooksCore {
     if (instance.provider) {
       if (typeof instance.provider === 'string') {
         pluginProvider = instance.provider;
+      } else if (Array.isArray(instance.provider)) {
+        // provider is list
+        if (instance.provider.indexOf(provider) === -1) {
+          return;
+        }
       } else {
         pluginProvider = instance.provider.constructor.getProviderName();
       }

diff --git a/packages/faas-cli-command-core/test/fixtures/userLifecycle/test.txt b/packages/faas-cli-command-core/test/fixtures/userLifecycle/test.txt
@@ -1 +1 @@
-1595516163422
+1597737411780
diff --git a/packages/faas-cli-command-core/test/plugins/test.lg.ts b/packages/faas-cli-command-core/test/plugins/test.lg.ts
@@ -1,7 +1,7 @@
 import { BasePlugin } from '../../src';
 
 class LogPlugin extends BasePlugin {
-  provider = 'test';
+  provider = ['test'];
   commands = {
     log: {
       usage: 'log command',

diff --git a/packages/runtime-engine/src/lib/loggerFactory.ts b/packages/runtime-engine/src/lib/loggerFactory.ts
@@ -19,8 +19,14 @@ export class BaseLoggerFactory implements LoggerFactory {
     this.Logger = Logger || ServerlessLogger;
   }
 
-  createLogger(options?) {
-    options = options || {};
+  createLogger(options?);
+  createLogger(filename?, options?) {
+    if (typeof filename === 'string') {
+      options = options || {};
+      options.file = filename;
+    } else {
+      options = filename || {};
+    }
     const lv = this.envParser ? this.envParser.getLoggerLevel() : 'ERROR';
     if (lv) {
       options.level = lv;