Output tweaks.

src/supervisor/supervisorctl.py

@@ -301,7 +301,7 @@ class Controller(cmd.Cmd):
         elif code == rpc.Faults.ABNORMAL_TERMINATION:
             return template % (processname, 'abornal termination')
         elif code == rpc.Faults.SUCCESS:
-            return '%s: OK' % processname
+            return '%s: started' % processname
         
         return default
 
@@ -342,7 +342,7 @@ class Controller(cmd.Cmd):
                         raise
                 else:
                     if result == True:
-                        self._output('%s: OK' % processname)
+                        self._output('%s: started' % processname)
                     else:
                         raise # assertion
 
@@ -428,7 +428,6 @@ class Controller(cmd.Cmd):
             return
 
         self.do_stop(arg)
-        self._output('')
         self.do_start(arg)
 
     def help_restart(self):

src/supervisor/tests.py

@@ -1385,7 +1385,7 @@ baz            STOPPED    Jun 26 11:42 PM (OK)
         controller.stdout = StringIO()
         result = controller.do_start('foo')
         self.assertEqual(result, None)
-        self.assertEqual(controller.stdout.getvalue(), 'foo: OK\n')
+        self.assertEqual(controller.stdout.getvalue(), 'foo: started\n')
 
     def test_start_many(self):
         options = DummyClientOptions()
@@ -1393,7 +1393,8 @@ baz            STOPPED    Jun 26 11:42 PM (OK)
         controller.stdout = StringIO()
         result = controller.do_start('foo bar')
         self.assertEqual(result, None)
-        self.assertEqual(controller.stdout.getvalue(), 'foo: OK\nbar: OK\n')
+        self.assertEqual(controller.stdout.getvalue(),
+                         'foo: started\nbar: started\n')
 
     def test_start_all(self):
         options = DummyClientOptions()
@@ -1403,7 +1404,7 @@ baz            STOPPED    Jun 26 11:42 PM (OK)
         self.assertEqual(result, None)
 
         self.assertEqual(controller.stdout.getvalue(),
-                    'foo: OK\nfoo2: OK\nfailed: ERROR (spawn error)\n')
+                'foo: started\nfoo2: started\nfailed: ERROR (spawn error)\n')
 
 
     def test_stop_fail(self):
@@ -1478,7 +1479,7 @@ baz            STOPPED    Jun 26 11:42 PM (OK)
         self.assertEqual(result, None)
 
         self.assertEqual(controller.stdout.getvalue(),
-                         'foo: stopped\n\nfoo: OK\n')
+                         'foo: stopped\nfoo: started\n')
 
     def test_restart_all(self):
         options = DummyClientOptions()
@@ -1489,8 +1490,9 @@ baz            STOPPED    Jun 26 11:42 PM (OK)
 
         self.assertEqual(controller.stdout.getvalue(),
                          ('foo: stopped\nfoo2: stopped\n'
-                          'failed: ERROR (no such process)\n\n'
-                          'foo: OK\nfoo2: OK\nfailed: ERROR (spawn error)\n'))
+                          'failed: ERROR (no such process)\n'
+                          'foo: started\nfoo2: started\n'
+                          'failed: ERROR (spawn error)\n'))
 
     def test_reload_fail(self):
         options = DummyClientOptions()