Add Requeue/Reject handling

package-health · Apr 5, 2022 · a90f87b · a90f87b
1 parent 8f7ab4e
commit a90f87b
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 42 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Application/Processor/Handler/PackageDiscoveryHandler.php b/src/Application/Processor/Handler/PackageDiscoveryHandler.php
@@ -53,7 +53,7 @@ public function __construct(
    *  - List of required dependencies per version
    *  - Package statistics
    */
-  public function __invoke(CommandInterface $command): HandlerResultEnum {
+  public function __invoke(CommandInterface $command, array $attributes = []): HandlerResultEnum {
     static $lastPackage = '';
     static $lastTimestamp = 0;
     try {
@@ -67,7 +67,7 @@ public function __invoke(CommandInterface $command): HandlerResultEnum {
         $lastPackage === $packageName &&
         time() - $lastTimestamp < 10
       ) {
-        $this->logger->info(
+        $this->logger->debug(
           'Package discovery handler: Skipping duplicated job',
           [
             'package'       => $packageName,
@@ -261,8 +261,8 @@ static function (string $key): bool {
       }
 
       // update deduplication guards
-      $lastPackage = $packageName;
-      $lastTimestamp = time();
+      $lastPackage   = $packageName;
+      $lastTimestamp = ($attributes['timestamp'] ?? new DateTimeImmutable())->getTimestamp();
 
       return HandlerResultEnum::Accept;
     } catch (Exception $exception) {
@@ -278,6 +278,11 @@ static function (string $key): bool {
         ]
       );
 
+      // reject a command that has been requeued
+      if ($attributes['isRedelivery'] ?? false) {
+        return HandlerResultEnum::Reject;
+      }
+
       return HandlerResultEnum::Requeue;
     }
   }

diff --git a/src/Application/Processor/Handler/UpdateDependencyStatusHandler.php b/src/Application/Processor/Handler/UpdateDependencyStatusHandler.php
@@ -33,7 +33,7 @@ public function __construct(
   /**
    * Updates all dependency references that "require" or "require-dev" $package
    */
-  public function __invoke(CommandInterface $command): HandlerResultEnum {
+  public function __invoke(CommandInterface $command, array $attributes = []): HandlerResultEnum {
     static $lastPackage = '';
     static $lastTimestamp = 0;
     try {
@@ -47,7 +47,7 @@ public function __invoke(CommandInterface $command): HandlerResultEnum {
         $lastPackage === $packageName &&
         time() - $lastTimestamp < 10
       ) {
-        $this->logger->info(
+        $this->logger->debug(
           'Update dependency status handler: Skipping duplicated job',
           [
             'package'       => $packageName,
@@ -98,8 +98,8 @@ public function __invoke(CommandInterface $command): HandlerResultEnum {
       }
 
       // update deduplication guards
-      $lastPackage = $packageName;
-      $lastTimestamp = time();
+      $lastPackage   = $packageName;
+      $lastTimestamp = ($attributes['timestamp'] ?? new DateTimeImmutable())->getTimestamp();
 
       return HandlerResultEnum::Accept;
     } catch (Exception $exception) {
@@ -115,6 +115,11 @@ public function __invoke(CommandInterface $command): HandlerResultEnum {
         ]
       );
 
+      // reject a command that has been requeued
+      if ($attributes['isRedelivery'] ?? false) {
+        return HandlerResultEnum::Reject;
+      }
+
       return HandlerResultEnum::Requeue;
     }
   }

diff --git a/src/Application/Processor/Handler/UpdateVersionStatusHandler.php b/src/Application/Processor/Handler/UpdateVersionStatusHandler.php
@@ -38,7 +38,7 @@ public function __construct(
   /**
    * Updates the version status that requires $dependency
    */
-  public function __invoke(CommandInterface $command): HandlerResultEnum {
+  public function __invoke(CommandInterface $command, array $attributes = []): HandlerResultEnum {
     static $lastDependency = '';
     static $lastTimestamp = 0;
     try {
@@ -53,7 +53,7 @@ public function __invoke(CommandInterface $command): HandlerResultEnum {
         $lastDependency === $dependencyName &&
         time() - $lastTimestamp < 10
       ) {
-        $this->logger->info(
+        $this->logger->debug(
           'Update version status handler: Skipping duplicated job',
           [
             'dependency'    => $dependencyName,
@@ -106,7 +106,7 @@ static function (Dependency $dependency): DependencyStatusEnum {
 
       // update deduplication guards
       $lastDependency = $dependencyName;
-      $lastTimestamp = time();
+      $lastTimestamp  = ($attributes['timestamp'] ?? new DateTimeImmutable())->getTimestamp();
 
       return HandlerResultEnum::Accept;
     } catch (Exception $exception) {
@@ -122,6 +122,11 @@ static function (Dependency $dependency): DependencyStatusEnum {
         ]
       );
 
+      // reject a command that has been requeued
+      if ($attributes['isRedelivery'] ?? false) {
+        return HandlerResultEnum::Reject;
+      }
+
       return HandlerResultEnum::Requeue;
     }
   }

diff --git a/src/Application/Processor/Listener/Dependency/DependencyUpdatedListener.php b/src/Application/Processor/Listener/Dependency/DependencyUpdatedListener.php
@@ -21,7 +21,7 @@ public function __construct(ProducerInterface $producer, LoggerInterface $logger
   /**
    * update the version status that requires $dependency
    */
-  public function __invoke(EventInterface $event): void {
+  public function __invoke(EventInterface $event, array $attributes = []): void {
     $dependency = $event->getDependency();
     $this->logger->debug(
       'Dependency updated',

diff --git a/src/Application/Processor/Listener/Package/PackageCreatedListener.php b/src/Application/Processor/Listener/Package/PackageCreatedListener.php
@@ -19,7 +19,7 @@ public function __construct(ProducerInterface $producer, LoggerInterface $logger
     $this->logger   = $logger;
   }
 
-  public function __invoke(EventInterface $event): void {
+  public function __invoke(EventInterface $event, array $attributes = []): void {
     $package = $event->getPackage();
     $this->logger->debug(
       'Package created',

diff --git a/src/Application/Processor/Listener/Package/PackageUpdatedListener.php b/src/Application/Processor/Listener/Package/PackageUpdatedListener.php
@@ -19,7 +19,7 @@ public function __construct(ProducerInterface $producer, LoggerInterface $logger
   }
 
 
-  public function __invoke(EventInterface $event): void {
+  public function __invoke(EventInterface $event, array $attributes = []): void {
     $package = $event->getPackage();
     $this->logger->debug(
       'Package updated',

diff --git a/src/Application/Processor/Listener/Version/VersionCreatedListener.php b/src/Application/Processor/Listener/Version/VersionCreatedListener.php
@@ -36,7 +36,7 @@ public function __construct(
    *
    * Note: only sets the latest version if it is stable
    */
-  public function __invoke(EventInterface $event): void {
+  public function __invoke(EventInterface $event, array $attributes = []): void {
     $version = $event->getVersion();
     $this->logger->debug(
       'Version created',