Merge pull request #270 from ondrej-fabry/master

Fix transport for status check
ligato · May 23, 2018 · cef076b · cef076b
2 parents 53d9f11 + 919b55a
commit cef076b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/flavors/connectors/all_connectors_flavor.go b/flavors/connectors/all_connectors_flavor.go
@@ -16,6 +16,7 @@ package connectors
 
 import (
 	"github.com/ligato/cn-infra/core"
+	"github.com/ligato/cn-infra/datasync"
 	"github.com/ligato/cn-infra/datasync/kvdbsync"
 	"github.com/ligato/cn-infra/datasync/resync"
 	"github.com/ligato/cn-infra/db/keyval/consul"
@@ -93,6 +94,11 @@ func (f *AllConnectorsFlavor) Inject() bool {
 	f.ETCD.Deps.Resync = &f.ResyncOrch
 	InjectKVDBSync(&f.ETCDDataSync, &f.ETCD, f.ETCD.PluginName, f.FlavorLocal, &f.ResyncOrch)
 
+	f.FlavorLocal.StatusCheck.Transport = &datasync.CompositeKVProtoWriter{Adapters: []datasync.KeyProtoValWriter{
+		&f.ETCDDataSync,
+		&f.ConsulDataSync,
+	}}
+
 	f.Redis.Deps.PluginInfraDeps = *f.InfraDeps("redis", local.WithConf())
 	InjectKVDBSync(&f.RedisDataSync, &f.Redis, f.Redis.PluginName, f.FlavorLocal, &f.ResyncOrch)
 

diff --git a/flavors/connectors/connectors_util.go b/flavors/connectors/connectors_util.go
@@ -34,9 +34,5 @@ func InjectKVDBSync(dbsync *kvdbsync.Plugin,
 		//Note, not injecting local.ETCDDataSync.ResyncOrch here
 
 		dbsync.ServiceLabel = &local.ServiceLabel
-
-		if local.StatusCheck.Transport == nil {
-			local.StatusCheck.Transport = dbsync
-		}
 	}
 }