Fix PCNTL signals and set worker logger (#7)

HealthengineAU · Nov 13, 2023 · 464ab32 · 464ab32
1 parent bc5ea60
commit 464ab32
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 52 deletions.
diff --git a/bin/resque b/bin/resque
@@ -2,6 +2,8 @@
 <?php
 
 // Find and initialize Composer
+use Psr\Log\LoggerInterface;
+
 $files = array(
     __DIR__ . '/../../vendor/autoload.php',
     __DIR__ . '/../../../autoload.php',
@@ -67,9 +69,9 @@ if($APP_INCLUDE) {
     require_once $APP_INCLUDE;
 }
 
-// See if the APP_INCLUDE containes a logger object,
+// See if the APP_INCLUDE contains a logger object,
 // If none exists, fallback to internal logger
-if (!isset($logger) || !is_object($logger)) {
+if (!isset($logger) || !($logger instanceof LoggerInterface)) {
     $logger = new Resque_Log($logLevel);
 }
 
@@ -114,7 +116,7 @@ if($count > 1) {
         elseif(!$pid) {
             $queues = explode(',', $QUEUE);
             $worker = new Resque_Worker($queues);
-            $worker->logLevel = $logLevel;
+            $worker->setLogger($logger);
             $worker->hasParent = true;
             fwrite(STDOUT, '*** Starting worker ' . $worker . "\n");
             $worker->work($interval);
@@ -171,7 +173,7 @@ if($count > 1) {
 else {
     $queues = explode(',', $QUEUE);
     $worker = new Resque_Worker($queues);
-    $worker->logLevel = $logLevel;
+    $worker->setLogger($logger);
     $worker->hasParent = false;
 
     $PIDFILE = getenv('PIDFILE');

diff --git a/lib/Resque.php b/lib/Resque.php
@@ -87,10 +87,6 @@ public static function redis()
      */
     public static function fork()
     {
-        if(!function_exists('pcntl_fork')) {
-            return false;
-        }
-
         // Close the connection to Redis before forking.
         // This is a workaround for issues phpredis has.
         self::$redis = null;

diff --git a/lib/Resque/Worker.php b/lib/Resque/Worker.php
@@ -1,5 +1,7 @@
 <?php
 
+use Psr\Log\LoggerInterface;
+
 /**
  * Resque worker that handles checking queues for jobs, fetching them
  * off the queues, running them and handling the result.
@@ -16,7 +18,7 @@ class Resque_Worker
     private static $processPrefix = 'resque';
 
     /**
-    * @var LoggerInterface Logging object that impliments the PSR-3 LoggerInterface
+    * @var LoggerInterface Logging object that implements the PSR-3 LoggerInterface
     */
     public $logger;
 
@@ -391,10 +393,7 @@ private function updateProcLine($status)
      */
     private function registerSigHandlers()
     {
-        if(!function_exists('pcntl_signal')) {
-            return;
-        }
-
+        pcntl_async_signals(true);
         pcntl_signal(SIGTERM, array($this, 'shutDownNow'));
         pcntl_signal(SIGINT, array($this, 'shutDownNow'));
         pcntl_signal(SIGQUIT, array($this, 'shutdown'));

diff --git a/lib/ResqueScheduler/Worker.php b/lib/ResqueScheduler/Worker.php
@@ -150,10 +150,7 @@ public function log($message)
      */
     private function registerSigHandlers()
     {
-        if(!function_exists('pcntl_signal')) {
-            return;
-        }
-
+        pcntl_async_signals(true);
         pcntl_signal(SIGTERM, array($this, 'shutdown'));
         pcntl_signal(SIGINT, array($this, 'shutdown'));
         pcntl_signal(SIGQUIT, array($this, 'shutdown'));

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,15 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Access to an undefined property Resque_Worker\\:\\:\\$logLevel\\.$#"
-			count: 2
-			path: bin/resque
-
-		-
-			message: "#^Call to an undefined method object\\:\\:log\\(\\)\\.$#"
-			count: 4
-			path: bin/resque
-
 		-
 			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
 			count: 2
@@ -195,11 +185,6 @@ parameters:
 			count: 1
 			path: lib/Resque.php
 
-		-
-			message: "#^Method Resque\\:\\:fork\\(\\) should return int but returns false\\.$#"
-			count: 1
-			path: lib/Resque.php
-
 		-
 			message: "#^Method Resque\\:\\:generateJobId\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -790,11 +775,6 @@ parameters:
 			count: 1
 			path: lib/Resque/Worker.php
 
-		-
-			message: "#^Call to method log\\(\\) on an unknown class LoggerInterface\\.$#"
-			count: 23
-			path: lib/Resque/Worker.php
-
 		-
 			message: "#^Cannot access property \\$queue on object\\|true\\.$#"
 			count: 1
@@ -1020,21 +1000,6 @@ parameters:
 			count: 1
 			path: lib/Resque/Worker.php
 
-		-
-			message: "#^Property Resque_Worker\\:\\:\\$logger \\(LoggerInterface\\) does not accept Psr\\\\Log\\\\LoggerInterface\\.$#"
-			count: 1
-			path: lib/Resque/Worker.php
-
-		-
-			message: "#^Property Resque_Worker\\:\\:\\$logger \\(LoggerInterface\\) does not accept Resque_Log\\.$#"
-			count: 1
-			path: lib/Resque/Worker.php
-
-		-
-			message: "#^Property Resque_Worker\\:\\:\\$logger has unknown class LoggerInterface as its type\\.$#"
-			count: 1
-			path: lib/Resque/Worker.php
-
 		-
 			message: "#^Property Resque_Worker\\:\\:\\$queues type has no value type specified in iterable type array\\.$#"
 			count: 1