Refactor logger callback print

Author: antonmedv

src/Logger/Logger.php

@@ -34,37 +34,27 @@ public function __construct(OutputInterface $output, HandlerInterface $log)
 
     public function command(Host $host, string $type, string $command): void
     {
-        // -v for run command
         if ($this->output->isVerbose()) {
             $this->output->writeln("[$host] <fg=green;options=bold>$type</> $command");
         }
         $this->fileLog->log("[{$host->getAlias()}] $type: $command");
     }
 
-    /**
-     * Returns a callable for use with the symfony Process->run($callable) method.
-     *
-     * @return callable A function expecting a int $type (e.g. Process::OUT or Process::ERR) and string $buffer parameters.
-     */
-    public function callback(Host $host, bool $forceOutput): callable
+    public function print(Host $host, string $buffer, bool $force = false): void
     {
-        return function ($type, $buffer) use ($forceOutput, $host) {
-            if ($this->output->isVerbose() || $forceOutput) {
-                $this->printBuffer($type, $host, $buffer);
+        if ($this->output->isVerbose() || $force) {
+            foreach (explode("\n", rtrim($buffer)) as $line) {
+                if (empty($line)) {
+                    return;
+                }
+                $this->output->writeln("[$host] $line");
             }
-        };
-    }
-
-    /**
-     * @param string $type Process::OUT or Process::ERR
-     */
-    public function printBuffer(string $type, Host $host, string $buffer): void
-    {
+        }
         foreach (explode("\n", rtrim($buffer)) as $line) {
             if (empty($line)) {
                 return;
             }
-            $this->output->writeln("[$host] $line");
+            $this->fileLog->log("[{$host->getAlias()}] $line");
         }
     }
 

src/ProcessRunner/ProcessRunner.php

@@ -36,11 +36,6 @@ public function run(Host $host, string $command, RunParams $params): string
     {
         $this->logger->command($host, 'run', $command);
 
-        $terminalOutput = $this->logger->callback($host, $params->forceOutput);
-        $callback = function ($type, $buffer) use ($terminalOutput) {
-            $terminalOutput($type, $buffer);
-        };
-
         if (!empty($params->env)) {
             $env = env_stringify($params->env);
             $command = "export $env; $command";
@@ -56,6 +51,10 @@ public function run(Host $host, string $command, RunParams $params): string
             ->setIdleTimeout($params->idleTimeout)
             ->setWorkingDirectory($params->cwd ?? deployer_root());
 
+        $callback = function ($type, $buffer) use ($params, $host) {
+            $this->logger->print($host, $buffer, $params->forceOutput);
+        };
+
         try {
             $process->mustRun($callback);
             return $process->getOutput();

src/Ssh/SshClient.php

@@ -69,7 +69,7 @@ public function run(Host $host, string $command, RunParams $params): string
             ->setIdleTimeout($params->idleTimeout);
 
         $callback = function ($type, $buffer) use ($params, $host) {
-            $this->logger->callback($host, $params->forceOutput)($type, $buffer);
+            $this->logger->print($host, $buffer, $params->forceOutput);
         };
 
         try {

src/Utility/Rsync.php

@@ -106,9 +106,7 @@ function (string $value) {
                 }
                 return;
             }
-            if ($this->output->isVerbose()) {
-                $this->logger->printBuffer($type, $host, $buffer);
-            }
+            $this->logger->print($host, $buffer);
         };
 
         $process = new Process($command);