docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

store: Get rid of "discovery" log messages 

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2015-05-14 22:35:14 -07:00
parent 924bde48e7
commit 0f61855877
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
discovery/kv/kv.go
View File

@ -6,6 +6,7 @@ import (
"strings" "strings"
"time" "time"
log "github.com/Sirupsen/logrus"
"github.com/docker/swarm/discovery" "github.com/docker/swarm/discovery"
"github.com/docker/swarm/pkg/store" "github.com/docker/swarm/pkg/store"
) )
@ -72,6 +73,7 @@ func (s *Discovery) Fetch() ([]*discovery.Entry, error) {
// Watch is exported // Watch is exported
func (s *Discovery) Watch(callback discovery.WatchCallback) { func (s *Discovery) Watch(callback discovery.WatchCallback) {
s.store.WatchTree(s.prefix, func(kv ...*store.KVPair) { s.store.WatchTree(s.prefix, func(kv ...*store.KVPair) {
log.WithField("name", s.backend).Debug("Discovery watch triggered")
// Traduce byte array entries to discovery.Entry // Traduce byte array entries to discovery.Entry
entries, _ := discovery.CreateEntries(convertToStringArray(kv)) entries, _ := discovery.CreateEntries(convertToStringArray(kv))
callback(entries) callback(entries)

4
pkg/store/consul.go
View File

@ -156,7 +156,6 @@ func (s *Consul) Watch(key string, callback WatchCallback) error {
eventChan := s.waitForChange(fkey) eventChan := s.waitForChange(fkey)
for _ = range eventChan { for _ = range eventChan {
log.WithField("name", "consul").Debug("Key watch triggered")
entry, err := s.Get(key) entry, err := s.Get(key)
if err != nil { if err != nil {
log.Error("Cannot refresh the key: ", fkey, ", cancelling watch") log.Error("Cannot refresh the key: ", fkey, ", cancelling watch")
@ -197,7 +196,7 @@ func (s *Consul) waitForChange(key string) <-chan uint64 {
} }
_, meta, err := kv.List(key, option) _, meta, err := kv.List(key, option)
if err != nil { if err != nil {
log.WithField("name", "consul").Errorf("Discovery error: %v", err) log.WithField("name", "consul").Error(err)
break break
} }
watch.LastIndex = meta.LastIndex watch.LastIndex = meta.LastIndex
@ -223,7 +222,6 @@ func (s *Consul) WatchTree(prefix string, callback WatchCallback) error {
eventChan := s.waitForChange(fprefix) eventChan := s.waitForChange(fprefix)
for _ = range eventChan { for _ = range eventChan {
log.WithField("name", "consul").Debug("Key watch triggered")
kvi, err := s.List(prefix) kvi, err := s.List(prefix)
if err != nil { if err != nil {
log.Error("Cannot refresh keys with prefix: ", fprefix, ", cancelling watch") log.Error("Cannot refresh keys with prefix: ", fprefix, ", cancelling watch")

2
pkg/store/etcd.go
View File

@ -148,7 +148,6 @@ func (s *Etcd) Watch(key string, callback WatchCallback) error {
go s.client.Watch(key, 0, false, watchChan, stopChan) go s.client.Watch(key, 0, false, watchChan, stopChan)
for _ = range watchChan { for _ = range watchChan {
log.WithField("name", "etcd").Debug("Discovery watch triggered")
entry, err := s.Get(key) entry, err := s.Get(key)
if err != nil { if err != nil {
log.Error("Cannot refresh the key: ", key, ", cancelling watch") log.Error("Cannot refresh the key: ", key, ", cancelling watch")
@ -227,7 +226,6 @@ func (s *Etcd) WatchTree(prefix string, callback WatchCallback) error {
// Start watch // Start watch
go s.client.Watch(prefix, 0, true, watchChan, stopChan) go s.client.Watch(prefix, 0, true, watchChan, stopChan)
for _ = range watchChan { for _ = range watchChan {
log.WithField("name", "etcd").Debug("Discovery watch triggered")
kvi, err := s.List(prefix) kvi, err := s.List(prefix)
if err != nil { if err != nil {
log.Error("Cannot refresh the key: ", prefix, ", cancelling watch") log.Error("Cannot refresh the key: ", prefix, ", cancelling watch")

2
pkg/store/zookeeper.go
View File

@ -115,7 +115,6 @@ func (s *Zookeeper) Watch(key string, callback WatchCallback) error {
for e := range eventChan { for e := range eventChan {
if e.Type == zk.EventNodeChildrenChanged { if e.Type == zk.EventNodeChildrenChanged {
log.WithField("name", "zk").Debug("Discovery watch triggered")
entry, err := s.Get(key) entry, err := s.Get(key)
if err == nil { if err == nil {
callback(entry) callback(entry)
@ -173,7 +172,6 @@ func (s *Zookeeper) WatchTree(prefix string, callback WatchCallback) error {
for e := range eventChan { for e := range eventChan {
if e.Type == zk.EventNodeChildrenChanged { if e.Type == zk.EventNodeChildrenChanged {
log.WithField("name", "zk").Debug("Discovery watch triggered")
kvi, err := s.List(prefix) kvi, err := s.List(prefix)
if err == nil { if err == nil {
callback(kvi...) callback(kvi...)