160431789 Pass plugin dirs names to plugin loader

Pass all the plugin dir names to gateway's plugin loaders.
apigee-internal · Aug 20, 2020 · ce23be1 · ce23be1
1 parent 2c1a745
commit ce23be1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cli/lib/gateway.js b/cli/lib/gateway.js
@@ -126,7 +126,7 @@ Gateway.prototype.start = (options,cb) => {
         delete args.keys;
         //set pluginDir
         if (!args.pluginDir) {
-            if (config.edgemicro.plugins.dir) {
+            if (config.edgemicro.plugins && config.edgemicro.plugins.dir) {
                 args.pluginDir = path.resolve(config.edgemicro.plugins.dir);
             }
         }

diff --git a/lib/plugins.js b/lib/plugins.js
@@ -56,7 +56,7 @@ Plugins.prototype.loadPlugins = function () {
       plugin = isBuiltIn;
     }
 
-    gateway.addPlugin(pluginName, _.bind(plugin.init, plugin));
+    gateway.addPlugin(pluginName, _.bind(plugin.init, plugin), combinedDirs);
   });
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ Plugins.prototype.loadPlugins = function () { @@
           plugin = isBuiltIn;
         }
-        gateway.addPlugin(pluginName, _.bind(plugin.init, plugin));
+        gateway.addPlugin(pluginName, _.bind(plugin.init, plugin), combinedDirs);
       });
     }
@@ Expand Down @@