From 4f923c71fbf5c35eb617af9e9bcbdceb58e51f4e Mon Sep 17 00:00:00 2001 From: Hans Moog <hm@mkjc.net> Date: Wed, 19 Jun 2019 17:41:35 +0200 Subject: [PATCH] Fix: fixed disabled plugins --- packages/node/node.go | 8 ++------ plugins/cli/plugin.go | 4 ++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/node/node.go b/packages/node/node.go index 6446d6fe..c0b99d37 100644 --- a/packages/node/node.go +++ b/packages/node/node.go @@ -14,13 +14,9 @@ type Node struct { logLevel int } -var disabledPlugins = make(map[string]bool) +var DisabledPlugins = make(map[string]bool) func Load(plugins ...*Plugin) *Node { - for _, disabledPlugin := range strings.Fields(*DISABLE_PLUGINS.Value) { - disabledPlugins[strings.ToLower(disabledPlugin)] = true - } - node := &Node{ logLevel: *LOG_LEVEL.Value, loggers: make([]*Logger, 0), @@ -98,7 +94,7 @@ func (node *Node) LogFailure(pluginName string, message string) { func (node *Node) Load(plugins ...*Plugin) { if len(plugins) >= 1 { for _, plugin := range plugins { - if _, exists := disabledPlugins[strings.ToLower(strings.Replace(plugin.Name, " ", "", -1))]; !exists { + if _, exists := DisabledPlugins[strings.ToLower(strings.Replace(plugin.Name, " ", "", -1))]; !exists { plugin.wg = node.wg plugin.Node = node diff --git a/plugins/cli/plugin.go b/plugins/cli/plugin.go index d8441da5..6f0d789a 100644 --- a/plugins/cli/plugin.go +++ b/plugins/cli/plugin.go @@ -40,6 +40,10 @@ func init() { func configure(ctx *node.Plugin) { flag.Parse() + for _, disabledPlugin := range strings.Fields(*node.DISABLE_PLUGINS.Value) { + node.DisabledPlugins[strings.ToLower(disabledPlugin)] = true + } + fmt.Println(" _____ _ _ ________ ______ ___ ___________ ") fmt.Println(" / ___| | | |_ _| \\/ || \\/ || ___| ___ \\") fmt.Println(" \\ `--.| |_| | | | | . . || . . || |__ | |_/ /") -- GitLab