From b5d3fdf77e16f8d8425e2b788f6d60b8bb270cd2 Mon Sep 17 00:00:00 2001 From: Pascal de Vink Date: Wed, 20 Dec 2017 15:22:27 +0100 Subject: [PATCH 1/2] Check if logger exists When handling a signal, a logger is used to log the catched signals. However, the logger can sometimes be uninitialised, which resulted in errors. --- .../Consumption/Extension/SignalExtension.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/enqueue/Consumption/Extension/SignalExtension.php b/pkg/enqueue/Consumption/Extension/SignalExtension.php index a3bab8500..7b08f09b2 100644 --- a/pkg/enqueue/Consumption/Extension/SignalExtension.php +++ b/pkg/enqueue/Consumption/Extension/SignalExtension.php @@ -18,7 +18,7 @@ class SignalExtension implements ExtensionInterface protected $interruptConsumption = false; /** - * @var LoggerInterface + * @var LoggerInterface|null */ protected $logger; @@ -84,7 +84,10 @@ public function onIdle(Context $context) public function interruptExecutionIfNeeded(Context $context) { if (false == $context->isExecutionInterrupted() && $this->interruptConsumption) { - $this->logger->debug('[SignalExtension] Interrupt execution'); + if ($this->logger) { + $this->logger->debug('[SignalExtension] Interrupt execution'); + } + $context->setExecutionInterrupted($this->interruptConsumption); $this->interruptConsumption = false; @@ -104,7 +107,10 @@ public function handleSignal($signal) case SIGTERM: // 15 : supervisor default stop case SIGQUIT: // 3 : kill -s QUIT case SIGINT: // 2 : ctrl+c - $this->logger->debug('[SignalExtension] Interrupt consumption'); + if ($this->logger) { + $this->logger->debug('[SignalExtension] Interrupt consumption'); + } + $this->interruptConsumption = true; break; default: From 12475ea3d4408fce3109809b110c240148cb4e97 Mon Sep 17 00:00:00 2001 From: Pascal de Vink Date: Wed, 20 Dec 2017 16:12:33 +0100 Subject: [PATCH 2/2] Remove whitespace on blank lines --- pkg/enqueue/Consumption/Extension/SignalExtension.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/enqueue/Consumption/Extension/SignalExtension.php b/pkg/enqueue/Consumption/Extension/SignalExtension.php index 7b08f09b2..aeeadff28 100644 --- a/pkg/enqueue/Consumption/Extension/SignalExtension.php +++ b/pkg/enqueue/Consumption/Extension/SignalExtension.php @@ -87,7 +87,7 @@ public function interruptExecutionIfNeeded(Context $context) if ($this->logger) { $this->logger->debug('[SignalExtension] Interrupt execution'); } - + $context->setExecutionInterrupted($this->interruptConsumption); $this->interruptConsumption = false; @@ -110,7 +110,7 @@ public function handleSignal($signal) if ($this->logger) { $this->logger->debug('[SignalExtension] Interrupt consumption'); } - + $this->interruptConsumption = true; break; default: