Add value of autorestart= to getAllConfigInfo()

Author: mnaberez

CHANGES.rst

@@ -1,6 +1,9 @@
 4.4.0.dev0 (Next Release)
 -------------------------
 
+- Fixed a bug where the XML-RPC method ``supervisor.getAllConfigInfo()``
+  did not return the value of the ``autorestart`` program option.
+
 - Parsing ``environment=`` in the config file now uses ``shlex`` in POSIX
   mode instead of legacy mode to allow for escaped quotes in the values.
   However, on Python 2 before 2.7.13 and Python 3 before 3.5.3, POSIX mode

supervisor/rpcinterface.py

@@ -10,6 +10,7 @@
 
 from supervisor.datatypes import (
     Automatic,
+    RestartWhenExitUnexpected,
     signal_number,
     )
 
@@ -568,6 +569,7 @@ def getAllConfigInfo(self):
             inuse = gconfig.name in self.supervisord.process_groups
             for pconfig in gconfig.process_configs:
                 d = {'autostart': pconfig.autostart,
+                     'autorestart': pconfig.autorestart,
                      'directory': pconfig.directory,
                      'uid': pconfig.uid,
                      'command': pconfig.command,
@@ -597,9 +599,16 @@ def getAllConfigInfo(self):
                      'stderr_syslog': pconfig.stderr_syslog,
                      'serverurl': pconfig.serverurl,
                     }
+
                 # no support for these types in xml-rpc
-                d.update((k, 'auto') for k, v in d.items() if v is Automatic)
-                d.update((k, 'none') for k, v in d.items() if v is None)
+                for k, v in d.items():
+                    if v is Automatic:
+                        d[k] = "auto"
+                    elif v is None:
+                        d[k] = "none"
+                    elif v is RestartWhenExitUnexpected:
+                        d[k] = "unexpected"
+
                 configinfo.append(d)
 
         configinfo.sort(key=lambda r: r['name'])

supervisor/tests/test_rpcinterfaces.py

@@ -17,6 +17,7 @@
 
 from supervisor.compat import as_string, PY2
 from supervisor.datatypes import Automatic
+from supervisor.datatypes import RestartWhenExitUnexpected
 
 class TestBase(unittest.TestCase):
     def setUp(self):
@@ -1146,10 +1147,12 @@ def test_getAllConfigInfo(self):
         supervisord = DummySupervisor(options, 'foo')
 
         pconfig1 = DummyPConfig(options, 'process1', __file__,
+                                autorestart=False,
                                 stdout_logfile=Automatic,
                                 stderr_logfile=Automatic,
                                 )
         pconfig2 = DummyPConfig(options, 'process2', __file__,
+                                autorestart=RestartWhenExitUnexpected,
                                 stdout_logfile=None,
                                 stderr_logfile=None,
                                 )
@@ -1160,6 +1163,7 @@ def test_getAllConfigInfo(self):
         interface = self._makeOne(supervisord)
         configs = interface.getAllConfigInfo()
         self.assertEqual(configs[0]['autostart'], True)
+        self.assertEqual(configs[0]['autorestart'], False)
         self.assertEqual(configs[0]['stopwaitsecs'], 10)
         self.assertEqual(configs[0]['stdout_events_enabled'], False)
         self.assertEqual(configs[0]['stderr_events_enabled'], False)
@@ -1187,6 +1191,7 @@ def test_getAllConfigInfo(self):
         assert 'test_rpcinterfaces.py' in configs[0]['command']
 
         self.assertEqual(configs[1]['autostart'], True)
+        self.assertEqual(configs[1]['autorestart'], "unexpected")
         self.assertEqual(configs[1]['stopwaitsecs'], 10)
         self.assertEqual(configs[1]['stdout_events_enabled'], False)
         self.assertEqual(configs[1]['stderr_events_enabled'], False)