Don't swallow errors when fg writes to stdin

Author: mnaberez

CHANGES.txt

@@ -34,6 +34,9 @@
 - ``supervisorctl`` commands ``avail``, ``reread``, and ``version`` now show
   an error message if an argument is given.
 
+- Fixed a bug where ``supervisorctl fg`` would swallow most XML-RPC faults.
+  ``fg`` now prints the fault and exits.
+
 3.3.1 (2016-08-02)
 ------------------
 

supervisor/supervisorctl.py

@@ -1327,22 +1327,22 @@ def do_fg(self, arg):
                 except xmlrpclib.Fault as e:
                     if e.faultCode == xmlrpc.Faults.NOT_RUNNING:
                         self.ctl.output('Process got killed')
-                        self.ctl.output('Exiting foreground')
-                        a.kill()
-                        return
+                    else:
+                        self.ctl.output('ERROR: ' + str(e))
+                    self.ctl.output('Exiting foreground')
+                    a.kill()
+                    return
 
                 info = supervisor.getProcessInfo(name)
                 if info['state'] != states.ProcessStates.RUNNING:
                     self.ctl.output('Process got killed')
                     self.ctl.output('Exiting foreground')
                     a.kill()
                     return
-                continue
         except (KeyboardInterrupt, EOFError):
+            self.ctl.output('Exiting foreground')
             if a:
                 a.kill()
-            self.ctl.output('Exiting foreground')
-        return
 
     def help_fg(self,args=None):
         self.ctl.output('fg <process>\tConnect to a process in foreground mode')