Merge branch 'feature-restart-task' into 'master'

Fixed the problem when restart container only 10 and the AMQP don't up

See merge request interlink-sa/flowdat3/modules/installer!58

tools/src/ReleaseImages.php

@@ -64,6 +64,11 @@ class ReleaseImages extends Command
      */
     public $_docker_restart_default;
 
+    /**
+     * @var string Contiene la politica de restart de los dockers de tasks.
+     */
+    public $_docker_restart_task;
+
     /**
      * @var string Contiene la politica de restart de los dockers.
      */
@@ -187,6 +192,7 @@ class ReleaseImages extends Command
         $this->_running_env = "running.env";
         $this->_host_env = "host.env";
         $this->_docker_restart_default = "on-failure:10";
+        $this->_docker_restart_task = "on-failure";
         $this->_docker_restart_always = "always";
         $this->_network_name = "flowdat3";
         $this->_user_system = ['users' =>

tools/src/Services/Base_log.php

@@ -49,7 +49,7 @@ class Base_log extends InitialService
             $this->getComposer()->service($module)
                 ->hostname($module)
                 ->command("bin/console rabbitmq:consumer log_consumer")
-                ->restart($this->getRelease()->_docker_restart_default)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->addEnv_file($this->getRelease()->_running_env)
                 ->addEnv_file($this->getRelease()->_host_env)
                 ->addEnv_file("$initial." . $this->getRelease()->_host_env)

tools/src/Services/Cablemodem_cmd.php

@@ -48,7 +48,7 @@ class Cablemodem_cmd extends InitialService
             $this->getComposer()->service($module)
                 ->hostname($module)
                 ->command("bin/console rabbitmq:consumer command_consumer")
-                ->restart($this->getRelease()->_docker_restart_default)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->addEnv_file($this->getRelease()->_running_env)
                 ->addEnv_file($this->getRelease()->_host_env)
                 ->addEnv_file("$initial." . $this->getRelease()->_host_env)

tools/src/Services/Cablemodem_task.php

@@ -48,7 +48,7 @@ class Cablemodem_task extends InitialService
             $this->getComposer()->service($module)
                 ->hostname($module)
                 ->command("bin/console rabbitmq:consumer flowdat_tasklogger")
-                ->restart($this->getRelease()->_docker_restart_default)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->addEnv_file($this->getRelease()->_running_env)
                 ->addEnv_file($this->getRelease()->_host_env)
                 ->addEnv_file("$initial." . $this->getRelease()->_host_env)

tools/src/Services/Dhcp_task.php

@@ -48,7 +48,7 @@ class Dhcp_task extends InitialService
             $this->getComposer()->service($module)
                 ->hostname($module)
                 ->command("bin/console rabbitmq:consumer flowdat_tasklogger")
-                ->restart($this->getRelease()->_docker_restart_default)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->addEnv_file($this->getRelease()->_running_env)
                 ->addEnv_file($this->getRelease()->_host_env)
                 ->addEnv_file("$initial." . $this->getRelease()->_host_env)

tools/src/Services/Ftth_task.php

@@ -50,7 +50,7 @@ class Ftth_task extends InitialService
             $this->getComposer()->service($module)
                 ->hostname($module)
                 ->command("bin/console rabbitmq:consumer flowdat_tasklogger")
-                ->restart($this->getRelease()->_docker_restart_default)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->addEnv_file($this->getRelease()->_running_env)
                 ->addEnv_file($this->getRelease()->_host_env)
                 ->addEnv_file("$initial." . $this->getRelease()->_host_env)

tools/src/Services/Genieacs_cwmp.php

@@ -47,7 +47,7 @@ class Genieacs_cwmp extends InitialService
             $this->getComposer()->service($module)
                 ->hostname($module)
                 ->addPorts("7547", "7547")
-                ->restart($this->getRelease()->_docker_restart_default)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->addVolumes("/etc/localtime:/etc/localtime:ro")
                 ->addVolumes("./hosts:/etc/hosts")
                 ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP());

tools/src/Services/Genieacs_fs.php

@@ -49,7 +49,7 @@ class Genieacs_fs extends InitialService
                 ->addPorts("7567", "7567")
                 ->addVolumes("/etc/localtime:/etc/localtime:ro")
                 ->addVolumes("./hosts:/etc/hosts")
-                ->restart($this->getRelease()->_docker_restart_default)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP());
             $this->addLink(new Mongodb(), $module)
                 ->addLink(new Redis(), $module);

tools/src/Services/Genieacs_gui.php

@@ -47,7 +47,7 @@ class Genieacs_gui extends InitialService
             $this->getComposer()->service($module)
                 ->hostname($module)
                 ->addPorts("3001", "3000")
-                ->restart($this->getRelease()->_docker_restart_default)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->addVolumes("/etc/localtime:/etc/localtime:ro")
                 ->addVolumes("./hosts:/etc/hosts")
                 ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP());

tools/src/Services/Genieacs_nbi.php

@@ -47,7 +47,7 @@ class Genieacs_nbi extends InitialService
             $this->getComposer()->service($module)
                 ->hostname($module)
                 ->addPorts("7557", "7557")
-                ->restart($this->getRelease()->_docker_restart_default)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->addVolumes("/etc/localtime:/etc/localtime:ro")
                 ->addVolumes("./hosts:/etc/hosts")
                 ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP());

tools/src/Services/Radius_task.php

@@ -48,7 +48,7 @@ class Radius_task extends InitialService
             $this->getComposer()->service($module)
                 ->hostname($module)
                 ->command("bin/console rabbitmq:consumer flowdat_tasklogger")
-                ->restart($this->getRelease()->_docker_restart_default)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->addEnv_file($this->getRelease()->_running_env)
                 ->addEnv_file($this->getRelease()->_host_env)
                 ->addEnv_file("$initial." . $this->getRelease()->_host_env)

tools/src/Services/Stats_cmd.php

@@ -49,7 +49,7 @@ class Stats_cmd extends InitialService
             $this->getComposer()->service($module)
                 ->hostname($module)
                 ->command("bin/console rabbitmq:consumer command_consumer")
-                ->restart($this->getRelease()->_docker_restart_always)
+                ->restart($this->getRelease()->_docker_restart_task)
                 ->addEnv_file($this->getRelease()->_running_env)
                 ->addEnv_file($this->getRelease()->_host_env)
                 ->addEnv_file("$initial." . $this->getRelease()->_host_env)