Fix js plugin not effective

fagongzi · Nov 25, 2019 · 59e0a2e · 59e0a2e
1 parent 6a7313b
commit 59e0a2e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -74,4 +74,5 @@ services:
       - --addr-store=etcd://etcd:2379
       - --metric-job=proxy
       - --metric-address=pushgateway:9091
-      - --interval-metric-sync=5
+      - --interval-metric-sync=5
+      - --js
diff --git a/pkg/plugin/engine.go b/pkg/plugin/engine.go
@@ -14,15 +14,17 @@ import (
 type Engine struct {
 	filter.BaseFilter
 
+	name       string
 	enable     bool
 	applied    []*Runtime
 	lastActive time.Time
 }
 
 // NewEngine returns a plugin engine
-func NewEngine(enable bool) *Engine {
+func NewEngine(enable bool, name string) *Engine {
 	return &Engine{
 		enable: enable,
+		name:   name,
 	}
 }
 
@@ -84,7 +86,7 @@ func (eng *Engine) ApplyPlugins(plugins ...*metapb.Plugin) error {
 
 // Name returns filter name
 func (eng *Engine) Name() string {
-	return "JS-Plugin-Engine"
+	return eng.name
 }
 
 // Init returns error if init failed

diff --git a/pkg/proxy/dispatcher_meta.go b/pkg/proxy/dispatcher_meta.go
@@ -625,7 +625,7 @@ func (r *dispatcher) maybeUpdateJSEngine(id uint64) error {
 
 func (r *dispatcher) updateJSEngine() error {
 	var plugins []*metapb.Plugin
-	newEngine := plugin.NewEngine(r.cnf.Option.EnableJSPlugin)
+	newEngine := plugin.NewEngine(r.cnf.Option.EnableJSPlugin, FilterJSPlugin)
 	for _, id := range r.appliedPlugins.AppliedIDs {
 		p := r.plugins[id]
 		plugins = append(plugins, p)

diff --git a/pkg/proxy/proxy.go b/pkg/proxy/proxy.go
@@ -90,7 +90,7 @@ func NewProxy(cfg *Cfg) *Proxy {
 		dispatches:    make([]chan *dispatchNode, cfg.Option.LimitCountDispatchWorker, cfg.Option.LimitCountDispatchWorker),
 		dispatchIndex: 0,
 		copyIndex:     0,
-		jsEngine:      plugin.NewEngine(cfg.Option.EnableJSPlugin),
+		jsEngine:      plugin.NewEngine(cfg.Option.EnableJSPlugin, FilterJSPlugin),
 	}
 
 	p.init()