From 69bdf1a87bf28a6348c4fcd58e9adefe96b4191c Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 13 May 2015 16:50:01 -0700 Subject: [PATCH] fix heartbeat default value Signed-off-by: Victor Vieux --- cluster/swarm/cluster.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cluster/swarm/cluster.go b/cluster/swarm/cluster.go index 259cf66b86..adf4611e8b 100644 --- a/cluster/swarm/cluster.go +++ b/cluster/swarm/cluster.go @@ -44,6 +44,7 @@ func NewCluster(scheduler *scheduler.Scheduler, store *state.Store, TLSConfig *t scheduler: scheduler, store: store, overcommitRatio: 0.05, + heartbeat: 25, discovery: dflag, TLSConfig: TLSConfig, } @@ -52,8 +53,11 @@ func NewCluster(scheduler *scheduler.Scheduler, store *state.Store, TLSConfig *t cluster.overcommitRatio = val } - if cluster.heartbeat, _ = options.Uint("swarm.discovery.heartbeat"); cluster.heartbeat < 1 { - return nil, errors.New("heartbeat should be an unsigned integer and greater than 0") + if heartbeat, ok := options.Uint("swarm.discovery.heartbeat"); ok { + cluster.heartbeat = heartbeat + if cluster.heartbeat < 1 { + return nil, errors.New("heartbeat should be an unsigned integer and greater than 0") + } } // get the list of entries from the discovery service