luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge branch 'master' of github.com:hashicorp/nomad

Browse source
This commit is contained in:
Diptanu Choudhury 2016-04-11 22:08:30 -04:00
parent bfe4c2733b 5fd5d80fca
commit e3bb02e4b6
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/client.go
View file

@ -1192,7 +1192,11 @@ func (c *Client) syncConsul() {
select {
case <-sync.C:
// Give up pruning services if we can't fingerprint Consul
if _, ok := c.config.Node.Attributes["consul.server"]; !ok {
c.configLock.RLock()
_, ok := c.configCopy.Node.Attributes["consul.server"]
c.configLock.RUnlock()
if !ok {
continue
}
services := make(map[string]struct{})

1
vendor/github.com/logrus generated vendored Submodule

@ -0,0 +1 @@
Subproject commit 4b6ea7319e214d98c938f12692336f7ca9348d6b