replace templating usage by simple array-to-config helper method

closes #41
Phobetor · May 7, 2018 · 30f1b83 · 30f1b83
1 parent fff62ad
commit 30f1b83
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 66 deletions.
diff --git a/Helpers/ConfigurationHelper.php b/Helpers/ConfigurationHelper.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Phobetor\RabbitMqSupervisorBundle\Helpers;
+
+class ConfigurationHelper
+{
+    public function getConfigurationStringFromDataArray(array $data)
+    {
+        $configurationString = '';
+
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                $configurationString .= sprintf("[%s]\n", $key);
+                $configurationString .= $this->getConfigurationStringFromDataArray($value);
+                $configurationString .= "\n";
+            }
+            else {
+                $configurationString .= sprintf("%s=%s\n", $key, $value);
+            }
+        }
+
+        return $configurationString;
+    }
+}
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -8,7 +8,6 @@ services:
         public: true
         arguments:
             - "@phobetor_rabbitmq_supervisor.supervisor_service"
-            - "@templating"
             - "%phobetor_rabbitmq_supervisor.paths%"
             - "%phobetor_rabbitmq_supervisor.commands%"
             - "%phobetor_rabbitmq_supervisor.consumers%"

diff --git a/Resources/views/Supervisor/program.conf.twig b/Resources/views/Supervisor/program.conf.twig
diff --git a/Resources/views/Supervisor/supervisord.conf.twig b/Resources/views/Supervisor/supervisord.conf.twig
diff --git a/Services/RabbitMqSupervisor.php b/Services/RabbitMqSupervisor.php
@@ -2,7 +2,7 @@
 
 namespace Phobetor\RabbitMqSupervisorBundle\Services;
 
-use Symfony\Component\Templating\EngineInterface;
+use Phobetor\RabbitMqSupervisorBundle\Helpers\ConfigurationHelper;
 
 /**
  * @license MIT
@@ -14,11 +14,6 @@ class RabbitMqSupervisor
      */
     private $supervisor;
 
-    /**
-     * @var \Symfony\Component\Templating\EngineInterface
-     */
-    private $templating;
-
     /**
      * @var array
      */
@@ -48,17 +43,15 @@ class RabbitMqSupervisor
      * Initialize Handler
      *
      * @param \Phobetor\RabbitMqSupervisorBundle\Services\Supervisor $supervisor
-     * @param \Symfony\Component\Templating\EngineInterface $templating
      * @param array $paths
      * @param array $commands
      * @param array $consumers
      * @param array $multipleConsumers
      * @param array $config
      */
-    public function __construct(Supervisor $supervisor, EngineInterface $templating, array $paths, array $commands, $consumers, $multipleConsumers, $config)
+    public function __construct(Supervisor $supervisor, array $paths, array $commands, $consumers, $multipleConsumers, $config)
     {
         $this->supervisor = $supervisor;
-        $this->templating = $templating;
         $this->paths = $paths;
         $this->commands = $commands;
         $this->consumers = $consumers;
@@ -237,15 +230,26 @@ private function createPathDirectories() {
 
     public function generateSupervisorConfiguration()
     {
-        $content = $this->templating->render(
-            'RabbitMqSupervisorBundle:Supervisor:supervisord.conf.twig',
-            array(
-                'pidFile' => $this->paths['pid_file'],
-                'sockFile' => $this->paths['sock_file'],
-                'logFile' => $this->paths['log_file'],
-                'workerConfigurationDirectory' => $this->paths['worker_configuration_directory'],
+        $configurationHelper = new ConfigurationHelper();
+        $content = $configurationHelper->getConfigurationStringFromDataArray(array(
+            'unix_http_server' => array(
+                'file' => $this->paths['sock_file'],
+                'chmod' => '0700'
+            ),
+            'supervisord' => array(
+                'logfile' => $this->paths['log_file'],
+                'pidfile' => $this->paths['pid_file']
+            ),
+            'rpcinterface:supervisor' => array(
+                'supervisor.rpcinterface_factory' => 'supervisor.rpcinterface:make_main_rpcinterface'
+            ),
+            'supervisorctl' => array(
+                'serverurl' => sprintf('unix://%s', $this->paths['sock_file'])
+            ),
+            'include' => array(
+                'files' => sprintf('%s*.conf', $this->paths['worker_configuration_directory'])
             )
-        );
+        ));
         file_put_contents(
             $this->createSupervisorConfigurationFilePath(),
             $content
@@ -295,18 +299,17 @@ private function generateWorkerConfigurations($names, $baseCommand)
             $this->generateWorkerConfiguration(
                 $name,
                 array(
-                    'name' => $name,
-                    'command' => $command,
-                    'executablePath' => $executablePath,
-                    'workerOutputLog' => $this->paths['worker_output_log_file'],
-                    'workerErrorLog' => $this->paths['worker_error_log_file'],
-                    'numprocs' => (int)$this->getConsumerWorkerOption($name, 'count'),
-                    'options' => array(
+                    sprintf('program:%s', $name) => array(
+                        'command' => sprintf('php %s %s --env=%s', $executablePath, $command, 'prod'), // todo {{ app.environment }}
+                        'process_name' => '%(program_name)s%(process_num)02d',
+                        'numprocs' => (int) $this->getConsumerWorkerOption($name, 'count'),
                         'startsecs' => $this->getConsumerWorkerOption($name, 'startsecs'),
                         'autorestart' => $this->transformBoolToString($this->getConsumerWorkerOption($name, 'autorestart')),
                         'stopsignal' => $this->getConsumerWorkerOption($name, 'stopsignal'),
                         'stopasgroup' => $this->transformBoolToString($this->getConsumerWorkerOption($name, 'stopasgroup')),
                         'stopwaitsecs' => $this->getConsumerWorkerOption($name, 'stopwaitsecs'),
+                        'stdout_logfile' => $this->paths['worker_output_log_file'],
+                        'stderr_logfile' => $this->paths['worker_error_log_file']
                     )
                 )
             );
@@ -406,7 +409,8 @@ private function transformBoolToString($value)
      */
     public function generateWorkerConfiguration($fileName, $vars)
     {
-        $content = $this->templating->render('RabbitMqSupervisorBundle:Supervisor:program.conf.twig', $vars);
+        $configurationHelper = new ConfigurationHelper();
+        $content = $configurationHelper->getConfigurationStringFromDataArray($vars);
         file_put_contents(
             sprintf('%s%s.conf', $this->paths['worker_configuration_directory'], $fileName),
             $content

diff --git a/composer.json b/composer.json
@@ -20,8 +20,7 @@
     "require": {
         "symfony/framework-bundle": "~2.5|~3.0|~4.0",
         "symfony/console": "~2.5|~3.0|~4.0",
-        "symfony/process": "~2.5|~3.0|~4.0",
-        "symfony/templating": "~2.5|~3.0|~4.0"
+        "symfony/process": "~2.5|~3.0|~4.0"
     },
     "suggest": {
         "php-amqplib/rabbitmq-bundle": "The rabbitmq bundle for symfony which this bundle takes the consumer information from",