From c135c99173685b5ef0a0b2ceb64c12f6b0851814 Mon Sep 17 00:00:00 2001 From: Jared Whiklo Date: Wed, 27 Apr 2022 15:58:52 -0500 Subject: [PATCH] Coder --- src/EventGenerator/EmitEvent.php | 17 +++++++++-------- .../Action/AbstractGenerateDerivativeBase.php | 2 ++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/EventGenerator/EmitEvent.php b/src/EventGenerator/EmitEvent.php index d40038d8..1ff29090 100644 --- a/src/EventGenerator/EmitEvent.php +++ b/src/EventGenerator/EmitEvent.php @@ -69,10 +69,11 @@ abstract class EmitEvent extends ConfigurableActionBase implements ContainerFact protected $messenger; /** - * The logger + * The logger. + * * @var \Drupal\Core\Logger\LoggerChannelInterface */ - protected $logger_channel; + protected $logger; /** * Constructs a EmitEvent action. @@ -95,7 +96,7 @@ abstract class EmitEvent extends ConfigurableActionBase implements ContainerFact * The messenger. * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher * Event dispatcher service. - * @param \Drupal\Core\Logger\LoggerChannelInterface $logger + * @param \Drupal\Core\Logger\LoggerChannelInterface $channel * Logger channel. */ public function __construct( @@ -117,7 +118,7 @@ abstract class EmitEvent extends ConfigurableActionBase implements ContainerFact $this->stomp = $stomp; $this->messenger = $messenger; $this->eventDispatcher = $event_dispatcher; - $this->logger_channel = $channel; + $this->logger = $channel; } /** @@ -163,19 +164,19 @@ abstract class EmitEvent extends ConfigurableActionBase implements ContainerFact ); } catch (StompHeaderEventException $e) { - $this->logger_channel->error($e->getMessage()); + $this->logger->error($e->getMessage()); $this->messenger->addError($e->getMessage()); return; } catch (StompException $e) { - $this->logger_channel->error("Unable to connect to JMS Broker: @msg", + $this->logger->error("Unable to connect to JMS Broker: @msg", ["@msg" => $e->getMessage()]); $this->messenger->addWarning("Unable to connect to JMS Broker, items might not be synchronized to external services."); return; } catch (\RuntimeException $e) { // Notify the user the event couldn't be generated and abort. - $this->logger_channel->error( + $this->logger->error( $this->t('Error generating event: @msg', ['@msg' => $e->getMessage()]) ); $this->messenger->addError( @@ -192,7 +193,7 @@ abstract class EmitEvent extends ConfigurableActionBase implements ContainerFact } catch (StompException $e) { // Log it. - $this->logger_channel->error( + $this->logger->error( 'Error publishing message: @msg', ['@msg' => $e->getMessage()] ); diff --git a/src/Plugin/Action/AbstractGenerateDerivativeBase.php b/src/Plugin/Action/AbstractGenerateDerivativeBase.php index 6ba4618c..9d0520a3 100644 --- a/src/Plugin/Action/AbstractGenerateDerivativeBase.php +++ b/src/Plugin/Action/AbstractGenerateDerivativeBase.php @@ -95,6 +95,8 @@ class AbstractGenerateDerivativeBase extends EmitEvent { * Field Manager service. * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher * Event dispatcher service. + * @param \Drupal\Core\Logger\LoggerChannelInterface $channel + * The logger channel. */ public function __construct( array $configuration,