Changing logging logic for logged in users

Author: stankut

os2web_logging.module

@@ -7,41 +7,11 @@
 
 use Drupal\Component\Datetime\DateTimePlus;
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\os2web_logging\Controller\LoggingController;
 use Drupal\os2web_logging\Form\SettingsForm;
 
-/**
- * Implements hook_ENTITY_TYPE_view().
- */
-function os2web_logging_node_view(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode) {
-  // Ignoring requests from CLI.
-  if (PHP_SAPI === 'cli') {
-    return;
-  }
-
-  $config = \Drupal::config(SettingsForm::$configName);
-
-  // Ignore anonymous user.
-  $logAnonymUser = $config->get('log_anonymous_user');
-  if (!$logAnonymUser && \Drupal::currentUser()->isAnonymous()) {
-    return;
-  }
-
-  // Filter on node type.
-  if ($node_types = $config->get('logged_node_types')) {
-    if (in_array($entity->getType(), $node_types, TRUE)) {
-
-      // Log entry.
-      $logger = \Drupal::logger('os2web_logging.access_log');
-      $logger->info('Node loaded', ['sid' => $entity->id()]);
-    }
-  }
-}
-
 /**
  * Implements hook_webform_element_access().
  */

os2web_logging.services.yml

@@ -19,3 +19,8 @@ services:
     class: Drupal\os2web_logging\Logger\AccessLogsDbLog
     tags:
       - { name: logger }
+  os2web_logging.node_access_event_subscriber:
+    class: Drupal\os2web_logging\EventSubscriber\NodeAccessEventSubscriber
+    arguments: []
+    tags:
+      - {name: event_subscriber}

src/EventSubscriber/NodeAccessEventSubscriber.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\os2web_logging\EventSubscriber;
+
+use Drupal\os2web_logging\Form\SettingsForm;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Class NodeAccessEventSubscriber.
+ *
+ * Runs on every request.
+ */
+class NodeAccessEventSubscriber implements EventSubscriberInterface {
+
+  /**
+   * Logs node access.
+   */
+  public function logNodeAccess() {
+    /** @var Drupal\node\NodeInterface $node */
+    $node = NULL;
+
+    $routeMatch = \Drupal::routeMatch();
+    if ($routeMatch->getRouteName() == 'entity.node.canonical' && $node = $routeMatch->getParameter('node')) {
+      $config = \Drupal::config(SettingsForm::$configName);
+
+      // Ignore anonymous user.
+      $logAnonymUser = $config->get('log_anonymous_user');
+      if (!$logAnonymUser && \Drupal::currentUser()->isAnonymous()) {
+        return;
+      }
+
+      // Filter on node type.
+      if ($node_types = $config->get('logged_node_types')) {
+        if (in_array($node->getType(), $node_types, TRUE)) {
+
+          // Log entry.
+          $logger = \Drupal::logger('os2web_logging.access_log');
+          $logger->info('Node loaded', ['sid' => $node->id()]);
+        }
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::REQUEST][] = ['logNodeAccess'];
+    return $events;
+  }
+
+}