Skip to content

Commit

Permalink
look for plugins in the config path used (as documented) instead of h…
Browse files Browse the repository at this point in the history
…ardcoded /etc/dkron (#1024)
  • Loading branch information
fopina committed Nov 16, 2021
1 parent d92b419 commit b8312ac
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions cmd/plugins.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/hashicorp/go-plugin"
"github.com/kardianos/osext"
"github.com/sirupsen/logrus"
"github.com/spf13/viper"
)

type Plugins struct {
Expand All @@ -33,14 +34,19 @@ func (p *Plugins) DiscoverPlugins() error {
p.Processors = make(map[string]dkplugin.Processor)
p.Executors = make(map[string]dkplugin.Executor)

// Look in /etc/dkron/plugins
processors, err := plugin.Discover("dkron-processor-*", filepath.Join("/etc", "dkron", "plugins"))
pluginDir := filepath.Join("/etc", "dkron", "plugins")
if viper.ConfigFileUsed() != "" {
pluginDir = filepath.Join(filepath.Dir(viper.ConfigFileUsed()), "plugins")
}

// Look in /etc/dkron/plugins (or the used config path)
processors, err := plugin.Discover("dkron-processor-*", pluginDir)
if err != nil {
return err
}

// Look in /etc/dkron/plugins
executors, err := plugin.Discover("dkron-executor-*", filepath.Join("/etc", "dkron", "plugins"))
// Look in /etc/dkron/plugins (or the used config path)
executors, err := plugin.Discover("dkron-executor-*", pluginDir)
if err != nil {
return err
}
Expand Down

0 comments on commit b8312ac

Please sign in to comment.