summaryrefslogtreecommitdiff
path: root/src/rhctl
diff options
context:
space:
mode:
Diffstat (limited to 'src/rhctl')
-rw-r--r--src/rhctl/switch_control.go5
-rw-r--r--src/rhctl/telnet.go2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/rhctl/switch_control.go b/src/rhctl/switch_control.go
index 9fd55ea..985f8b3 100644
--- a/src/rhctl/switch_control.go
+++ b/src/rhctl/switch_control.go
@@ -227,7 +227,10 @@ func (ctrl *SwitchControl) selectNextValidServer() {
func (ctrl *SwitchControl) reconcile(requestedServer string) (result bool) {
if !ctrl.state.Settled {
- return
+ if requestedServer != "" {
+ rhl.Printf("SwitchCTRL: ignoreing preferred server requests while settling")
+ return
+ }
}
if len(ctrl.servers) < 1 {
ctrl.state.Mood = MoodHappy
diff --git a/src/rhctl/telnet.go b/src/rhctl/telnet.go
index f872c79..77362bc 100644
--- a/src/rhctl/telnet.go
+++ b/src/rhctl/telnet.go
@@ -195,7 +195,7 @@ func telnetCmdServer(c *telgo.Client, args []string, ctrl *SwitchControl) bool {
c.Sayln("%v", r)
case bool:
if !r.(bool) {
- c.Sayln("the switch-over was denied - is the requested server alive?")
+ c.Sayln("the switch-over was denied - is the requested server alive? is the state settling?")
}
}