Merge pull request #49 from punktDeForks/feature/log-errors

TASK: log errors on job failure
Flowpack · Jan 14, 2021 · e1e8efb · e1e8efb
2 parents f78a130 + 221c7c5
commit e1e8efb
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/Classes/Job/JobManager.php b/Classes/Job/JobManager.php
@@ -15,10 +15,13 @@
 use Neos\Cache\Frontend\VariableFrontend;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Core\Booting\Scripts;
+use Neos\Flow\Log\ThrowableStorageInterface;
+use Neos\Flow\Log\Utility\LogEnvironment;
 use Neos\Flow\Property\PropertyMapper;
 use Flowpack\JobQueue\Common\Exception as JobQueueException;
 use Flowpack\JobQueue\Common\Queue\Message;
 use Flowpack\JobQueue\Common\Queue\QueueManager;
+use Psr\Log\LoggerInterface;
 
 /**
  * Job manager
@@ -62,6 +65,18 @@ class JobManager
      */
     protected $flowSettings;
 
+    /**
+     * @Flow\Inject
+     * @var ThrowableStorageInterface
+     */
+    protected $throwableStorage;
+
+    /**
+     * @Flow\Inject
+     * @var LoggerInterface
+     */
+    protected $logger;
+
     /**
      * Put a job in the queue
      *
@@ -120,10 +135,14 @@ public function waitAndExecute(string $queueName, $timeout = null): ?Message
                 $releaseOptions = isset($queueSettings['releaseOptions']) ? $queueSettings['releaseOptions'] : [];
                 $queue->release($message->getIdentifier(), $releaseOptions);
                 $this->emitMessageReleased($queue, $message, $releaseOptions, $exception);
+                $logMessage = $this->throwableStorage->logThrowable($exception);
+                $this->logger->error($logMessage, LogEnvironment::fromMethodName(__METHOD__));
                 throw new JobQueueException(sprintf('Job execution for job (message: "%s", queue: "%s") failed (%d/%d trials) - RELEASE', $message->getIdentifier(), $queue->getName(), $message->getNumberOfReleases() + 1, $maximumNumberOfReleases + 1), 1334056583, $exception);
             } else {
                 $queue->abort($message->getIdentifier());
                 $this->emitMessageFailed($queue, $message, $exception);
+                $logMessage = $this->throwableStorage->logThrowable($exception);
+                $this->logger->error($logMessage, LogEnvironment::fromMethodName(__METHOD__));
                 throw new JobQueueException(sprintf('Job execution for job (message: "%s", queue: "%s") failed (%d/%d trials) - ABORTING', $message->getIdentifier(), $queue->getName(), $message->getNumberOfReleases() + 1, $maximumNumberOfReleases + 1), 1334056584, $exception);
             }
         } finally {