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

fix heartbeat default value 

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Victor Vieux 2015-05-13 16:50:01 -07:00
parent 2180a703cb
commit 69bdf1a87b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/swarm/cluster.go
View File

@ -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