From 9176e77111a60537129bbda22df183afe94bb1e6 Mon Sep 17 00:00:00 2001 From: James Phillips Date: Wed, 15 Mar 2017 15:27:40 -0700 Subject: [PATCH] Shuts down flooder when either Serf is shut down. --- consul/server.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/consul/server.go b/consul/server.go index 691def634..df24cdc99 100644 --- a/consul/server.go +++ b/consul/server.go @@ -334,7 +334,10 @@ func NewServer(config *Config) (*Server, error) { for { WAIT: select { - case <-s.shutdownCh: + case <-s.serfLAN.ShutdownCh(): + return + + case <-s.serfWAN.ShutdownCh(): return case <-ticker.C: