Use same conventions as other commands

Author: mnaberez

supervisor/supervisorctl.py

@@ -1282,56 +1282,55 @@ def help_version(self):
             "version\t\t\tShow the version of the remote supervisord "
             "process")
 
-    def do_fg(self, args=None):
+    def do_fg(self, arg):
         if not self.ctl.upcheck():
             return
 
-        if not args:
-            self.handle_error('Error: no process name supplied')
+        names = arg.split()
+        if not names:
+            self.handle_error('ERROR: no process name supplied')
             self.help_fg()
             return
-
-        args = args.split()
-        if len(args) > 1:
-            self.handle_error('Error: too many process names supplied')
+        if len(names) > 1:
+            self.handle_error('ERROR: too many process names supplied')
             return
 
-        program = args[0]
+        name = names[0]
         supervisor = self.ctl.get_supervisor()
+
         try:
-            info = supervisor.getProcessInfo(program)
-        except xmlrpclib.Fault as msg:
-            if msg.faultCode == xmlrpc.Faults.BAD_NAME:
-                self.handle_error('Error: bad process name supplied')
-                return
-            # for any other fault
-            self.ctl.output(str(msg))
+            info = supervisor.getProcessInfo(name)
+        except xmlrpclib.Fault as e:
+            if e.faultCode == xmlrpc.Faults.BAD_NAME:
+                self.handle_error('ERROR: bad process name supplied')
+            else:
+                self.ctl.output('ERROR: ' + str(e))
             return
 
-        if not info['state'] == states.ProcessStates.RUNNING:
-            self.handle_error('Error: process not running')
+        if info['state'] != states.ProcessStates.RUNNING:
+            self.handle_error('ERROR: process not running')
             return
 
         a = None
         try:
             # this thread takes care of the output/error messages
-            a = fgthread(program, self.ctl)
+            a = fgthread(name, self.ctl)
             a.start()
 
             # this takes care of the user input
             while True:
                 inp = raw_input() + '\n'
                 try:
-                    supervisor.sendProcessStdin(program, inp)
-                except xmlrpclib.Fault as msg:
-                    if msg.faultCode == xmlrpc.Faults.NOT_RUNNING:
+                    supervisor.sendProcessStdin(name, inp)
+                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
 
-                info = supervisor.getProcessInfo(program)
-                if not info['state'] == states.ProcessStates.RUNNING:
+                info = supervisor.getProcessInfo(name)
+                if info['state'] != states.ProcessStates.RUNNING:
                     self.ctl.output('Process got killed')
                     self.ctl.output('Exiting foreground')
                     a.kill()

supervisor/tests/test_supervisorctl.py

@@ -1931,35 +1931,35 @@ def test_fg_too_few_args(self):
         result = plugin.do_fg('')
         self.assertEqual(result, None)
         lines = plugin.ctl.stdout.getvalue().split('\n')
-        self.assertEqual(lines[0], 'Error: no process name supplied')
+        self.assertEqual(lines[0], 'ERROR: no process name supplied')
         self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.GENERIC)
 
     def test_fg_too_many_args(self):
         plugin = self._makeOne()
         result = plugin.do_fg('foo bar')
         self.assertEqual(result, None)
         line = plugin.ctl.stdout.getvalue()
-        self.assertEqual(line, 'Error: too many process names supplied\n')
+        self.assertEqual(line, 'ERROR: too many process names supplied\n')
         self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.GENERIC)
 
     def test_fg_badprocname(self):
         plugin = self._makeOne()
         result = plugin.do_fg('BAD_NAME')
         self.assertEqual(result, None)
         line = plugin.ctl.stdout.getvalue()
-        self.assertEqual(line, 'Error: bad process name supplied\n')
+        self.assertEqual(line, 'ERROR: bad process name supplied\n')
         self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.GENERIC)
 
     def test_fg_procnotrunning(self):
         plugin = self._makeOne()
         result = plugin.do_fg('bar')
         self.assertEqual(result, None)
         line = plugin.ctl.stdout.getvalue()
-        self.assertEqual(line, 'Error: process not running\n')
+        self.assertEqual(line, 'ERROR: process not running\n')
         result = plugin.do_fg('baz_01')
         lines = plugin.ctl.stdout.getvalue().split('\n')
         self.assertEqual(result, None)
-        self.assertEqual(lines[-2], 'Error: process not running')
+        self.assertEqual(lines[-2], 'ERROR: process not running')
         self.assertEqual(plugin.ctl.exit_status, LSBInitErrorCode.GENERIC)
 
     def test_fg_upcheck_failed(self):