Skip to content
Snippets Groups Projects
Commit 0f5af6c3 authored by richardpapp's avatar richardpapp
Browse files

Fix LogMessageEvent tokens not available

parent 2c912aa3
Branches
Tags
1 merge request!246Merging develop into main
Pipeline #1273923 passed
......@@ -101,6 +101,9 @@
"drupal/dynamic_entity_reference": {
"#3099176 Errors when new entity types are added": "https://www.drupal.org/files/issues/2023-09-08/3099176-3.x-16.diff"
},
"drupal/eca": {
"#3461808 LogMessageEvent tokens not available": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3461808.diff"
},
"drupal/elasticsearch_connector": {
"#2952301 Flatten keys": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/elasticsearch_connector.patch"
},
......
diff --git a/modules/log/src/Event/LogMessageEvent.php b/modules/log/src/Event/LogMessageEvent.php
index 485a8f9f..875590cc 100644
--- a/modules/log/src/Event/LogMessageEvent.php
+++ b/modules/log/src/Event/LogMessageEvent.php
@@ -2,7 +2,6 @@
namespace Drupal\eca_log\Event;
-use Drupal\eca\Plugin\DataType\DataTransferObject;
use Symfony\Contracts\EventDispatcher\Event;
/**
@@ -37,13 +36,6 @@ class LogMessageEvent extends Event {
*/
protected array $context;
- /**
- * An instance holding log data accessible as token.
- *
- * @var \Drupal\eca\Plugin\DataType\DataTransferObject|null
- */
- protected ?DataTransferObject $logData = NULL;
-
/**
* Construct a LogMessageEvent.
*
@@ -90,14 +82,4 @@ class LogMessageEvent extends Event {
return $this->context;
}
- /**
- * Get the log data.
- *
- * @return \Drupal\eca\Plugin\DataType\DataTransferObject|null
- * The log data or NULL.
- */
- public function getLogData(): ?DataTransferObject {
- return $this->logData;
- }
-
}
diff --git a/modules/log/src/Plugin/ECA/Event/LogEvent.php b/modules/log/src/Plugin/ECA/Event/LogEvent.php
index 5f9cf751..e23ecb72 100644
--- a/modules/log/src/Plugin/ECA/Event/LogEvent.php
+++ b/modules/log/src/Plugin/ECA/Event/LogEvent.php
@@ -28,6 +28,13 @@ use Symfony\Contracts\EventDispatcher\Event;
*/
class LogEvent extends EventBase {
+ /**
+ * An instance holding log data accessible as token.
+ *
+ * @var \Drupal\eca\Plugin\DataType\DataTransferObject|null
+ */
+ protected ?DataTransferObject $logData = NULL;
+
/**
* {@inheritdoc}
*/
@@ -142,10 +149,10 @@ class LogEvent extends EventBase {
public function getData(string $key): mixed {
$event = $this->event;
if ($key === 'log' && $event instanceof LogMessageEvent) {
- if ($logData = $event->getLogData()) {
+ if ($this->logData === NULL) {
$message = str_replace('@backtrace_string', '', $event->getMessage());
$context = $this->cleanupIterableForDto($event->getContext());
- $logData = DataTransferObject::create([
+ $this->logData = DataTransferObject::create([
'severity' => DataTransferObject::create($event->getSeverity()),
'message' => [
'raw' => DataTransferObject::create($event->getMessage()),
@@ -154,7 +161,7 @@ class LogEvent extends EventBase {
'context' => DataTransferObject::create($context),
]);
}
- return $logData;
+ return $this->logData;
}
return parent::getData($key);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment