baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

drop "slave" wording for "worker"

Browse source 
Traefik should follow modern IT trends, and use manager/leader/worker/agent, etc. instead of "master/slave".

e.g jenkinsci/jenkins#2007 (https://issues.jenkins-ci.org/browse/JENKINS-27268)

NB: of course, it can only apply where possible, since backends like Mesos should retain their own concepts, and not add more confusion.
This commit is contained in:
djalal 2017-05-21 14:35:11 +02:00 committed by Ludovic Fernandez
parent 96939e2990
commit ad54c5a278
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cluster/leadership.go
View file

@ -86,7 +86,7 @@ func (l *Leadership) onElection(elected bool) {
l.leader.Set(true) l.leader.Set(true)
l.Start() l.Start()
} else { } else {
log.Infof("Node %s elected slave ♝", l.Cluster.Node) log.Infof("Node %s elected worker ♝", l.Cluster.Node)
l.leader.Set(false) l.leader.Set(false)
l.Stop() l.Stop()
} }

6
docs/user-guide/cluster.md
View file

@ -15,6 +15,6 @@ Please refer to [this section](/user-guide/kv-config/#store-configuration-in-key
## Deploy a Træfik cluster ## Deploy a Træfik cluster
Once your Træfik configuration is uploaded on your KV store, you can start each Træfik instance. Once your Træfik configuration is uploaded on your KV store, you can start each Træfik instance.
A Træfik cluster is based on a master/slave model. A Træfik cluster is based on a manager/worker model.
When starting, Træfik will elect a master. If this instance fails, another master will be automatically elected. When starting, Træfik will elect a manager. If this instance fails, another manager will be automatically elected.