Remove messenger

Author: antonmedv

src/Command/RunCommand.php

@@ -89,7 +89,7 @@ protected function execute(Input $input, Output $output): int
             try {
                 $task->run(new Context($host));
             } catch (\Throwable $exception) {
-                $this->deployer->messenger->renderException($exception, $host);
+                $this->deployer->logger->renderException($exception, $host);
             }
         }
 

src/Deployer.php

@@ -22,18 +22,17 @@
 use Deployer\Component\PharUpdate\Console\Command as PharUpdateCommand;
 use Deployer\Component\PharUpdate\Console\Helper as PharUpdateHelper;
 use Deployer\Component\Pimple\Container;
-use Deployer\Logger\Logger;
-use Deployer\ProcessRunner\ProcessRunner;
-use Deployer\Ssh\SshClient;
 use Deployer\Executor\Master;
-use Deployer\Executor\Messenger;
 use Deployer\Host\Host;
 use Deployer\Host\HostCollection;
 use Deployer\Host\Localhost;
 use Deployer\Importer\Importer;
 use Deployer\Logger\Handler\FileHandler;
 use Deployer\Logger\Handler\NullHandler;
+use Deployer\Logger\Logger;
+use Deployer\ProcessRunner\ProcessRunner;
 use Deployer\Selector\Selector;
+use Deployer\Ssh\SshClient;
 use Deployer\Task\ScriptManager;
 use Deployer\Task\TaskCollection;
 use Deployer\Utility\Httpie;
@@ -61,7 +60,6 @@
  * @property Task\ScriptManager $scriptManager
  * @property Selector $selector
  * @property Master $master
- * @property Messenger $messenger
  * @property Logger $logger
  * @property Collection $fail
  * @property InputDefinition $inputDefinition
@@ -127,7 +125,7 @@ public function __construct(Application $console)
                 : new NullHandler();
         };
         $this['logger'] = function ($c) {
-            return new Logger($c['output'], $this['logHandler']);
+            return new Logger($c['input'], $c['output'], $this['logHandler']);
         };
         $this['sshClient'] = function ($c) {
             return new SshClient($c['output'], $c['logger']);
@@ -153,15 +151,12 @@ public function __construct(Application $console)
         $this['fail'] = function () {
             return new Collection();
         };
-        $this['messenger'] = function ($c) {
-            return new Messenger($c['input'], $c['output']);
-        };
         $this['master'] = function ($c) {
             return new Master(
                 $c['hosts'],
                 $c['input'],
                 $c['output'],
-                $c['messenger'],
+                $c['logger'],
             );
         };
         $this['importer'] = function () {

src/Executor/Master.php

@@ -13,6 +13,7 @@
 use Deployer\Deployer;
 use Deployer\Host\Host;
 use Deployer\Host\HostCollection;
+use Deployer\Logger\Logger;
 use Deployer\Selector\Selector;
 use Deployer\Ssh\IOArguments;
 use Deployer\Task\Context;
@@ -35,19 +36,19 @@ class Master
     private HostCollection $hosts;
     private InputInterface $input;
     private OutputInterface $output;
-    private Messenger $messenger;
+    private Logger $logger;
     private string|false $phpBin;
 
     public function __construct(
         HostCollection  $hosts,
         InputInterface  $input,
         OutputInterface $output,
-        Messenger       $messenger,
+        Logger          $logger,
     ) {
         $this->hosts = $hosts;
         $this->input = $input;
         $this->output = $output;
-        $this->messenger = $messenger;
+        $this->logger = $logger;
         $this->phpBin = (new PhpExecutableFinder())->find();
     }
 
@@ -61,7 +62,7 @@ public function run(array $tasks, array $hosts, ?Planner $plan = null): int
 
         foreach ($tasks as $task) {
             if (!$plan) {
-                $this->messenger->startTask($task);
+                $this->logger->startTask($task);
             }
 
             $plannedHosts = $hosts;
@@ -134,7 +135,7 @@ public function run(array $tasks, array $hosts, ?Planner $plan = null): int
             }
 
             if (!$plan) {
-                $this->messenger->endTask($task);
+                $this->logger->endTask($task);
             }
         }
 
@@ -156,7 +157,7 @@ private function runTask(Task $task, array $hosts): int
                 $worker = new Worker(Deployer::get());
                 $exitCode = $worker->execute($task, $host);
                 if ($exitCode !== 0) {
-                    $this->messenger->endTask($task, true);
+                    $this->logger->endTask($task);
                     return $exitCode;
                 }
             }
@@ -235,7 +236,7 @@ private function runTask(Task $task, array $hosts): int
         $this->gatherOutput($processes, $echoCallback);
 
         if ($this->cumulativeExitCode($processes) !== 0) {
-            $this->messenger->endTask($task, true);
+            $this->logger->endTask($task);
         }
 
         return $this->cumulativeExitCode($processes);

src/Executor/Messenger.php

@@ -37,11 +37,11 @@ public function execute(Task $task, Host $host): int
             $task->run($context);
 
             if ($task->getName() !== 'connect') {
-                $this->deployer->messenger->endOnHost($host);
+                $this->deployer->logger->endOnHost($host);
             }
             return 0;
         } catch (Throwable $e) {
-            $this->deployer->messenger->renderException($e, $host);
+            $this->deployer->logger->renderException($e, $host);
             if ($e instanceof GracefulShutdownException) {
                 return GracefulShutdownException::EXIT_CODE;
             }