Make JSVM the default driver (#1888)

* api_loader: use mwDriver as the middleware driver, fixes #1887 * coprocess_bundle: only call HandleMiddlewareCache when using rich plugins
TykTechnologies · Sep 4, 2018 · ac789fb · ac789fb
1 parent aa96862
commit ac789fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/api_loader.go b/api_loader.go
@@ -220,9 +220,10 @@ func processSpec(spec *APISpec, apisByListen map[string]int,
 		"api_name": spec.Name,
 	}).Debug("Loading Middleware")
 	var mwPaths []string
+
 	mwPaths, mwAuthCheckFunc, mwPreFuncs, mwPostFuncs, mwPostAuthCheckFuncs, mwDriver = loadCustomMiddleware(spec)
 
-	if spec.CustomMiddleware.Driver == apidef.OttoDriver {
+	if mwDriver == apidef.OttoDriver {
 		spec.JSVM.LoadJSPaths(mwPaths, prefix)
 	}
 

diff --git a/coprocess_bundle.go b/coprocess_bundle.go
@@ -97,7 +97,8 @@ func (b *Bundle) Verify() error {
 func (b *Bundle) AddToSpec() {
 	b.Spec.CustomMiddleware = b.Manifest.CustomMiddleware
 
-	if GlobalDispatcher != nil {
+	// Call HandleMiddlewareCache only when using rich plugins:
+	if GlobalDispatcher != nil && b.Spec.CustomMiddleware.Driver != apidef.OttoDriver {
 		GlobalDispatcher.HandleMiddlewareCache(&b.Manifest, b.Path)
 	}
 }