Reduced logging significantly

Author: jekuaitk

config/install/advancedqueue.advancedqueue_queue.os2web_audit.yml

@@ -5,6 +5,6 @@ label: os2web_audit
 backend: database
 backend_configuration:
   lease_time: 300
-processor: cron
+processor: daemon
 processing_time: 90
 locked: false

src/Plugin/AdvancedQueue/JobType/LogMessages.php

@@ -2,11 +2,13 @@
 
 namespace Drupal\os2web_audit\Plugin\AdvancedQueue\JobType;
 
-use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\advancedqueue\Job;
 use Drupal\advancedqueue\JobResult;
 use Drupal\advancedqueue\Plugin\AdvancedQueue\JobType\JobTypeBase;
+use Drupal\os2web_audit\Exception\AuditException;
+use Drupal\os2web_audit\Exception\ConnectionException;
 use Drupal\os2web_audit\Service\Logger;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -31,7 +33,6 @@ public static function create(ContainerInterface $container, array $configuratio
       $plugin_id,
       $plugin_definition,
       $container->get('os2web_audit.logger'),
-      $container->get('logger.factory'),
     );
   }
 
@@ -45,7 +46,6 @@ public function __construct(
     $plugin_id,
     $plugin_definition,
     private readonly Logger $logger,
-    private readonly LoggerChannelFactoryInterface $watchdog,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
   }
@@ -56,20 +56,12 @@ public function __construct(
   public function process(Job $job): JobResult {
     $payload = $job->getPayload();
 
-    $logger_context = [
-      'job_id' => $job->getId(),
-      'operation' => 'response from queue',
-    ];
-
     try {
       $this->logger->log($payload['type'], $payload['timestamp'], $payload['line'], $payload['plugin_id'], $payload['metadata']);
-      $this->watchdog->get(Logger::OS2WEB_AUDIT_LOGGER_CHANNEL)->info('Successfully audit logged message.', $logger_context);
 
       return JobResult::success();
     }
-    catch (\Exception $e) {
-      $this->watchdog->get(Logger::OS2WEB_AUDIT_LOGGER_CHANNEL)->error(sprintf('Failed audit logging message: %s', $e->getMessage()), $logger_context);
-
+    catch (PluginException | ConnectionException | AuditException $e) {
       return JobResult::failure($e->getMessage());
     }
   }

src/Service/Logger.php

@@ -100,25 +100,27 @@ private function createLoggingJob(string $type, int $timestamp, string $line, bo
     $config = $this->configFactory->get(SettingsForm::$configName);
     $plugin_id = $config->get('provider') ?? SettingsForm::OS2WEB_AUDIT_DEFUALT_PROVIDER;
 
-    $queueStorage = $this->entityTypeManager->getStorage('advancedqueue_queue');
-    /** @var \Drupal\advancedqueue\Entity\Queue $queue */
-    $queue = $queueStorage->load(self::OS2WEB_AUDIT_QUEUE_ID);
-    $job = Job::create(LogMessages::class, [
+    $payload = [
       'type' => $type,
       'timestamp' => $timestamp,
       'line' => $line,
       'plugin_id' => $plugin_id,
       'metadata' => $metadata,
-    ]);
+    ];
 
-    $queue->enqueueJob($job);
+    try {
+      $queueStorage = $this->entityTypeManager->getStorage('advancedqueue_queue');
+      /** @var \Drupal\advancedqueue\Entity\Queue $queue */
+      $queue = $queueStorage->load(self::OS2WEB_AUDIT_QUEUE_ID);
 
-    $logger_context = [
-      'job_id' => $job->getId(),
-      'operation' => 'log message queued',
-    ];
+      $job = Job::create(LogMessages::class, $payload);
+
+      $queue->enqueueJob($job);
+    }
+    catch (\Exception $exception) {
+      $this->watchdog->get(self::OS2WEB_AUDIT_LOGGER_CHANNEL)->error(sprintf('Failed creating job: %s', $exception->getMessage()), $payload);
+    }
 
-    $this->watchdog->get(self::OS2WEB_AUDIT_LOGGER_CHANNEL)->notice('Added audit logging message to queue for processing.', $logger_context);
   }
 
   /**
@@ -135,22 +137,17 @@ private function createLoggingJob(string $type, int $timestamp, string $line, bo
    * @param array<string, string> $metadata
    *   Additional metadata for the log message. Default is an empty array.
    *
-   * @throws \Exception.
+   * @throws \Drupal\Component\Plugin\Exception\PluginException
+   * @throws \Drupal\os2web_audit\Exception\ConnectionException
+   * @throws \Drupal\os2web_audit\Exception\AuditException
    */
   public function log(string $type, int $timestamp, string $line, string $plugin_id, array $metadata = []): void {
 
     $configuration = $this->configFactory->get(PluginSettingsForm::getConfigName())->get($plugin_id);
 
-    try {
-      /** @var \Drupal\os2web_audit\Plugin\AuditLogger\AuditLoggerInterface $logger */
-      $logger = $this->loggerManager->createInstance($plugin_id, $configuration ?? []);
-      $logger->log($type, $timestamp, $line, $metadata);
-    }
-    catch (\Exception $e) {
-      // Log (not audit log) an error and throw error in order to retry.
-      $this->watchdog->get(self::OS2WEB_AUDIT_LOGGER_CHANNEL)->error($e->getMessage());
-      throw $e;
-    }
+    /** @var \Drupal\os2web_audit\Plugin\AuditLogger\AuditLoggerInterface $logger */
+    $logger = $this->loggerManager->createInstance($plugin_id, $configuration ?? []);
+    $logger->log($type, $timestamp, $line, $metadata);
   }
 
 }