diff options
author | Valery Piashchynski <[email protected]> | 2021-04-30 16:32:11 +0300 |
---|---|---|
committer | Valery Piashchynski <[email protected]> | 2021-04-30 16:32:11 +0300 |
commit | 4236dfac2cd65a9031b04aa659448152868a4190 (patch) | |
tree | 591e77440a7f595d595c72cf1129e235501a75b1 /plugins/kv | |
parent | 38021decff98dabcab873f4c258f12d122988cdd (diff) | |
parent | 009b7009885d8a15e6fa6c7e78436087b2f20129 (diff) |
Merge branch 'beta' into stable
Diffstat (limited to 'plugins/kv')
-rw-r--r-- | plugins/kv/config.go | 1 | ||||
-rw-r--r-- | plugins/kv/drivers/boltdb/driver.go | 2 | ||||
-rw-r--r-- | plugins/kv/drivers/boltdb/plugin.go | 3 | ||||
-rw-r--r-- | plugins/kv/drivers/memcached/plugin.go | 3 | ||||
-rw-r--r-- | plugins/kv/drivers/memory/plugin.go | 4 | ||||
-rw-r--r-- | plugins/kv/storage.go | 4 |
6 files changed, 15 insertions, 2 deletions
diff --git a/plugins/kv/config.go b/plugins/kv/config.go index 9ecae644..66095817 100644 --- a/plugins/kv/config.go +++ b/plugins/kv/config.go @@ -1,5 +1,6 @@ package kv +// Config represents general storage configuration with keys as the user defined kv-names and values as the drivers type Config struct { Data map[string]interface{} `mapstructure:"kv"` } diff --git a/plugins/kv/drivers/boltdb/driver.go b/plugins/kv/drivers/boltdb/driver.go index b596d4c3..2e2df527 100644 --- a/plugins/kv/drivers/boltdb/driver.go +++ b/plugins/kv/drivers/boltdb/driver.go @@ -401,8 +401,6 @@ func (d *Driver) startGCLoop() { //nolint:gocognit }) if err != nil { d.log.Error("error during the gc phase of update", "error", err) - // todo this error is ignored, it means, that timer still be active - // to prevent this, we need to invoke t.Stop() return false } } diff --git a/plugins/kv/drivers/boltdb/plugin.go b/plugins/kv/drivers/boltdb/plugin.go index 9d1e0dba..9b4cf9f7 100644 --- a/plugins/kv/drivers/boltdb/plugin.go +++ b/plugins/kv/drivers/boltdb/plugin.go @@ -63,3 +63,6 @@ func (s *Plugin) Provide(key string) (kv.Storage, error) { func (s *Plugin) Name() string { return PluginName } + +// Available interface implementation +func (s *Plugin) Available() {} diff --git a/plugins/kv/drivers/memcached/plugin.go b/plugins/kv/drivers/memcached/plugin.go index af59e91b..cde84f42 100644 --- a/plugins/kv/drivers/memcached/plugin.go +++ b/plugins/kv/drivers/memcached/plugin.go @@ -33,6 +33,9 @@ func (s *Plugin) Name() string { return PluginName } +// Available interface implementation +func (s *Plugin) Available() {} + func (s *Plugin) Provide(key string) (kv.Storage, error) { const op = errors.Op("boltdb_plugin_provide") st, err := NewMemcachedDriver(s.log, key, s.cfgPlugin) diff --git a/plugins/kv/drivers/memory/plugin.go b/plugins/kv/drivers/memory/plugin.go index acc6023d..2be7caae 100644 --- a/plugins/kv/drivers/memory/plugin.go +++ b/plugins/kv/drivers/memory/plugin.go @@ -62,3 +62,7 @@ func (s *Plugin) Provide(key string) (kv.Storage, error) { func (s *Plugin) Name() string { return PluginName } + +// Available interface implementation +func (s *Plugin) Available() { +} diff --git a/plugins/kv/storage.go b/plugins/kv/storage.go index e8468b77..fe2fa10b 100644 --- a/plugins/kv/storage.go +++ b/plugins/kv/storage.go @@ -184,3 +184,7 @@ func (p *Plugin) RPC() interface{} { func (p *Plugin) Name() string { return PluginName } + +// Available interface implementation +func (p *Plugin) Available() { +} |