Add test and docs for %(numprocs)d expansion. Closes Supervisor#1269

Author: mnaberez

CHANGES.rst

@@ -5,6 +5,10 @@
   suppresses the main log from being echoed to ``stdout`` as it normally
   would.  Patch by Trevor Foster.
 
+- Parsing ``command=`` now supports a new expansion, ``%(numprocs)d``, that
+  expands to the value of ``numprocs=`` in the same section.  Patch by
+  Santjago Corkez.
+
 - Web UI buttons no longer use background images.  Patch by Dmytro Karpovych.
 
 - The HTTP server will now send an ``X-Accel-Buffering: no`` header in

docs/configuration.rst

@@ -640,11 +640,11 @@ where specified.
   e.g. ``/path/to/programname --port=80%(process_num)02d`` might
   expand to ``/path/to/programname --port=8000`` at runtime.  String
   expressions are evaluated against a dictionary containing the keys
-  ``group_name``, ``host_node_name``, ``process_num``, ``program_name``,
-  ``here`` (the directory of the supervisord config file), and all
-  supervisord's environment variables prefixed with ``ENV_``.  Controlled
-  programs should themselves not be daemons, as supervisord assumes it is
-  responsible for daemonizing its subprocesses (see
+  ``group_name``, ``host_node_name``, ``program_name``, ``process_num``,
+  ``numprocs``, ``here`` (the directory of the supervisord config file),
+  and all supervisord's environment variables prefixed with ``ENV_``.
+  Controlled programs should themselves not be daemons, as supervisord
+  assumes it is responsible for daemonizing its subprocesses (see
   :ref:`nondaemonizing_of_subprocesses`).
 
   .. note::
@@ -661,6 +661,8 @@ where specified.
 
   *Introduced*: 3.0
 
+  *Changed*: 4.2.0.  Added support for the ``numprocs`` expansion.
+
 ``process_name``
 
   A Python string expression that is used to compose the supervisor

supervisor/tests/test_options.py

@@ -1674,12 +1674,12 @@ def test_processes_from_section_process_num_expansion(self):
         instance = self._makeOne()
         text = lstrip("""\
         [program:foo]
+        process_name = foo_%(process_num)d
         command = /bin/foo --num=%(process_num)d
         directory = /tmp/foo_%(process_num)d
         stderr_logfile = /tmp/foo_%(process_num)d_stderr
         stdout_logfile = /tmp/foo_%(process_num)d_stdout
         environment = NUM=%(process_num)d
-        process_name = foo_%(process_num)d
         numprocs = 2
         """)
         from supervisor.options import UnhosedConfigParser
@@ -1697,6 +1697,23 @@ def test_processes_from_section_process_num_expansion(self):
                 '/tmp/foo_%d_stdout' % num)
             self.assertEqual(pconfigs[num].environment, {'NUM': '%d' % num})
 
+    def test_processes_from_section_numprocs_expansion(self):
+        instance = self._makeOne()
+        text = lstrip("""\
+        [program:foo]
+        process_name = foo_%(process_num)d
+        command = /bin/foo --numprocs=%(numprocs)d
+        numprocs = 2
+        """)
+        from supervisor.options import UnhosedConfigParser
+        config = UnhosedConfigParser()
+        config.read_string(text)
+        pconfigs = instance.processes_from_section(config, 'program:foo', 'bar')
+        self.assertEqual(len(pconfigs), 2)
+        for num in (0, 1):
+            self.assertEqual(pconfigs[num].name, 'foo_%d' % num)
+            self.assertEqual(pconfigs[num].command, "/bin/foo --numprocs=%d" % 2)
+
     def test_processes_from_section_expands_directory(self):
         instance = self._makeOne()
         text = lstrip("""\