yiisoft#126: Handles a fatal error of the job execution in isolate mode

Author: zhuravljov

src/cli/Command.php

@@ -7,10 +7,10 @@
 
 namespace yii\queue\cli;
 
+use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Exception\RuntimeException as ProcessRuntimeException;
 use Symfony\Component\Process\Process;
 use yii\console\Controller;
-use yii\console\ExitCode;
 
 /**
  * Base Command.
@@ -19,6 +19,15 @@
  */
 abstract class Command extends Controller
 {
+    /**
+     * The exit code of the exec action which is returned when job was done.
+     */
+    const EXEC_DONE = 0;
+    /**
+     * The exit code of the exec action which is returned when job wasn't done and wanted next attempt.
+     */
+    const EXEC_RETRY = 3;
+
     /**
      * @var Queue
      */
@@ -46,7 +55,6 @@ abstract class Command extends Controller
      */
     public $phpBinary;
 
-
     /**
      * @inheritdoc
      */
@@ -134,10 +142,9 @@ public function beforeAction($action)
     public function actionExec($id, $ttr, $attempt, $pid)
     {
         if ($this->queue->execute($id, file_get_contents('php://stdin'), $ttr, $attempt, $pid)) {
-            return ExitCode::OK;
+            return self::EXEC_DONE;
         }
-
-        return ExitCode::UNSPECIFIED_ERROR;
+        return self::EXEC_RETRY;
     }
 
     /**
@@ -174,18 +181,20 @@ protected function handleMessage($id, $message, $ttr, $attempt)
 
         $process = new Process($cmd, null, null, $message, $ttr);
         try {
-            $process->run(function ($type, $buffer) {
+            $result = $process->run(function ($type, $buffer) {
                 if ($type === Process::ERR) {
                     $this->stderr($buffer);
                 } else {
                     $this->stdout($buffer);
                 }
             });
+            if (!in_array($result, [self::EXEC_DONE, self::EXEC_RETRY])) {
+                throw new ProcessFailedException($process);
+            }
+            return $result === self::EXEC_DONE;
         } catch (ProcessRuntimeException $error) {
             $job = $this->queue->serializer->unserialize($message);
             return $this->queue->handleError($id, $job, $ttr, $attempt, $error);
         }
-
-        return $process->isSuccessful();
     }
 }

src/cli/VerboseBehavior.php

@@ -89,11 +89,14 @@ public function afterError(ErrorEvent $event)
         $this->command->stdout($this->jobTitle($event), Console::FG_GREY);
         $this->command->stdout(' - ', Console::FG_YELLOW);
         $this->command->stdout('Error', Console::BG_RED);
-        $duration = number_format(round(microtime(true) - $this->jobStartedAt, 3), 3);
-        $this->command->stdout(" ($duration s)", Console::FG_YELLOW);
+        if ($this->jobStartedAt) {
+            $duration = number_format(round(microtime(true) - $this->jobStartedAt, 3), 3);
+            $this->command->stdout(" ($duration s)", Console::FG_YELLOW);
+        }
         $this->command->stdout(PHP_EOL);
         $this->command->stdout('> ' . get_class($event->error) . ': ', Console::FG_RED);
-        $this->command->stdout($event->error->getMessage(), Console::FG_GREY);
+        $message = explode("\n", ltrim($event->error->getMessage()), 2)[0]; // First line
+        $this->command->stdout($message, Console::FG_GREY);
         $this->command->stdout(PHP_EOL);
     }