[Supervisor-checkins] r856 - in supervisor/trunk: . src/supervisor

[Mike Naberezny]

Author: Mike Naberezny <mike at maintainable.com>
Date: Fri May 22 17:37:38 2009
New Revision: 856

Log:
  - Supervisorctl now correctly interprets all of the error codes that can
    be returned when starting a process.  Patch by Francesc Alted.


Modified:
   supervisor/trunk/CHANGES.txt
   supervisor/trunk/src/supervisor/supervisorctl.py

Modified: supervisor/trunk/CHANGES.txt
==============================================================================
--- supervisor/trunk/CHANGES.txt	(original)
+++ supervisor/trunk/CHANGES.txt	Fri May 22 17:37:38 2009
@@ -1,5 +1,8 @@
 Next Release
 
+  - Supervisorctl now correctly interprets all of the error codes that can
+    be returned when starting a process.  Patch by Francesc Alted.
+
   - New 'stdout_events_enabled' and 'stderr_events_enabled' config options
     have been added to the '[program:x]', '[fcgi-program:x]', and 
     '[eventlistener:x]' sections.  These enable the emitting of new 

Modified: supervisor/trunk/src/supervisor/supervisorctl.py
==============================================================================
--- supervisor/trunk/src/supervisor/supervisorctl.py	(original)
+++ supervisor/trunk/src/supervisor/supervisorctl.py	Fri May 22 17:37:38 2009
@@ -609,9 +609,13 @@
         code = result['status']
         template = '%s: ERROR (%s)'
         if code == xmlrpc.Faults.BAD_NAME:
-            return template % (name,'no such process')
+            return template % (name, 'no such process')
+        elif code == xmlrpc.Faults.NO_FILE:
+            return template % (name, 'no such file')
+        elif code == xmlrpc.Faults.NOT_EXECUTABLE:
+            return template % (name, 'file is not executable')
         elif code == xmlrpc.Faults.ALREADY_STARTED:
-            return template % (name,'already started')
+            return template % (name, 'already started')
         elif code == xmlrpc.Faults.SPAWN_ERROR:
             return template % (name, 'spawn error')
         elif code == xmlrpc.Faults.ABNORMAL_TERMINATION: