From 1882192bc53cd131571658efbd0f46348168872f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 29 Sep 2016 23:50:37 +0200 Subject: don't switch to mood nervous if just channel is wrong diff --git a/src/rhctl/switch_control.go b/src/rhctl/switch_control.go index 200bae7..64da3c4 100644 --- a/src/rhctl/switch_control.go +++ b/src/rhctl/switch_control.go @@ -306,13 +306,10 @@ func (ctrl *SwitchControl) reconcile(requestedServer string) (result bool) { } } else { if s.Channel != swch { - // TODO: during normal operation switching server channels is expected and shouldn't lead to mood nervous?!?!? - ctrl.state.Mood = MoodNervous - rhl.Printf("SwitchCTRL: switch and server channel mismatch: '%s' != '%s' -> now in mood: %s", swch, s.Channel, ctrl.state.Mood) + rhl.Printf("SwitchCTRL: switch and server channel mismatch: '%s' != '%s' -> switching...", swch, s.Channel) if !ctrl.selectServer(ctrl.state.ActiveServer) { ctrl.selectNextValidServer() } - return } } -- cgit v0.10.2