diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/checker/plugin.go | 2 | ||||
| -rw-r--r-- | plugins/http/plugin.go | 2 | ||||
| -rw-r--r-- | plugins/informer/plugin.go | 2 | ||||
| -rw-r--r-- | plugins/logger/plugin.go | 2 | ||||
| -rw-r--r-- | plugins/metrics/plugin.go | 2 | ||||
| -rw-r--r-- | plugins/resetter/plugin.go | 2 | ||||
| -rw-r--r-- | plugins/rpc/plugin.go | 2 | ||||
| -rw-r--r-- | plugins/static/plugin.go | 6 |
8 files changed, 13 insertions, 7 deletions
diff --git a/plugins/checker/plugin.go b/plugins/checker/plugin.go index 407cb2fa..59a37613 100644 --- a/plugins/checker/plugin.go +++ b/plugins/checker/plugin.go @@ -7,7 +7,7 @@ import ( "github.com/gofiber/fiber/v2" fiberLogger "github.com/gofiber/fiber/v2/middleware/logger" - "github.com/spiral/endure" + endure "github.com/spiral/endure/pkg/container" "github.com/spiral/errors" "github.com/spiral/roadrunner/v2/plugins/config" "github.com/spiral/roadrunner/v2/plugins/logger" diff --git a/plugins/http/plugin.go b/plugins/http/plugin.go index 249d2e57..b1c68d89 100644 --- a/plugins/http/plugin.go +++ b/plugins/http/plugin.go @@ -13,7 +13,7 @@ import ( "sync" "github.com/hashicorp/go-multierror" - "github.com/spiral/endure" + endure "github.com/spiral/endure/pkg/container" "github.com/spiral/errors" "github.com/spiral/roadrunner/v2/interfaces/pool" "github.com/spiral/roadrunner/v2/interfaces/worker" diff --git a/plugins/informer/plugin.go b/plugins/informer/plugin.go index 3391ee01..7200c51f 100644 --- a/plugins/informer/plugin.go +++ b/plugins/informer/plugin.go @@ -1,7 +1,7 @@ package informer import ( - "github.com/spiral/endure" + endure "github.com/spiral/endure/pkg/container" "github.com/spiral/errors" "github.com/spiral/roadrunner/v2/interfaces/worker" "github.com/spiral/roadrunner/v2/plugins/logger" diff --git a/plugins/logger/plugin.go b/plugins/logger/plugin.go index 719770c0..141ede64 100644 --- a/plugins/logger/plugin.go +++ b/plugins/logger/plugin.go @@ -1,7 +1,7 @@ package logger import ( - "github.com/spiral/endure" + endure "github.com/spiral/endure/pkg/container" "github.com/spiral/errors" "github.com/spiral/roadrunner/v2/plugins/config" "go.uber.org/zap" diff --git a/plugins/metrics/plugin.go b/plugins/metrics/plugin.go index 859f3d24..fefe92bd 100644 --- a/plugins/metrics/plugin.go +++ b/plugins/metrics/plugin.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/spiral/endure" + endure "github.com/spiral/endure/pkg/container" "github.com/spiral/errors" "github.com/spiral/roadrunner/v2/plugins/config" "github.com/spiral/roadrunner/v2/plugins/logger" diff --git a/plugins/resetter/plugin.go b/plugins/resetter/plugin.go index 611cb363..ee0deda6 100644 --- a/plugins/resetter/plugin.go +++ b/plugins/resetter/plugin.go @@ -1,7 +1,7 @@ package resetter import ( - "github.com/spiral/endure" + endure "github.com/spiral/endure/pkg/container" "github.com/spiral/errors" "github.com/spiral/roadrunner/v2/plugins/logger" ) diff --git a/plugins/rpc/plugin.go b/plugins/rpc/plugin.go index 84ebb3d0..55b24cd1 100644 --- a/plugins/rpc/plugin.go +++ b/plugins/rpc/plugin.go @@ -5,7 +5,7 @@ import ( "net/rpc" "sync/atomic" - "github.com/spiral/endure" + endure "github.com/spiral/endure/pkg/container" "github.com/spiral/errors" goridgeRpc "github.com/spiral/goridge/v3/pkg/rpc" "github.com/spiral/roadrunner/v2/plugins/config" diff --git a/plugins/static/plugin.go b/plugins/static/plugin.go index fa2bcfbe..6e6fa67d 100644 --- a/plugins/static/plugin.go +++ b/plugins/static/plugin.go @@ -30,13 +30,19 @@ type Plugin struct { func (s *Plugin) Init(cfg config.Configurer, log logger.Logger) error { const op = errors.Op("static_plugin_init") if !cfg.Has(RootPluginName) { + return errors.E(op, errors.Disabled) } + err := cfg.UnmarshalKey(RootPluginName, &s.cfg) if err != nil { return errors.E(op, errors.Disabled, err) } + m := make(map[string]interface{}) + m["http:static"] = nil + cfg.Overwrite(m) + if s.cfg.Static == nil { return errors.E(op, errors.Disabled) } |