Use async signals with PCNTL (#6)

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

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/bin/resque b/bin/resque
@@ -123,7 +123,8 @@ if($count > 1) {
             $children[$pid] = 1;
             while (count($children) == $count) {
                 if (!isset($registered)) {
-                    declare(ticks=1);
+                    pcntl_async_signals(true);
+
                     foreach ($all_signals as $signal) {
                         pcntl_signal($signal, "cleanup_children");
                     }

diff --git a/lib/Resque/Worker.php b/lib/Resque/Worker.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(ticks=1);
-
 /**
  * Resque worker that handles checking queues for jobs, fetching them
  * off the queues, running them and handling the result.
@@ -167,10 +165,6 @@ public function work($interval = Resque::DEFAULT_INTERVAL, $blocking = false)
         $this->updateProcLine('Starting');
         $this->startup();
 
-        if(function_exists('pcntl_signal_dispatch')) {
-            pcntl_signal_dispatch();
-        }
-
         while(true) {
             if($this->shutdown) {
                 break;
@@ -247,14 +241,7 @@ public function work($interval = Resque::DEFAULT_INTERVAL, $blocking = false)
                 $this->logger->log(Psr\Log\LogLevel::INFO, $status);
 
                 // Wait until the child process finishes before continuing
-                while (pcntl_wait($status, WNOHANG) === 0) {
-                    if(function_exists('pcntl_signal_dispatch')) {
-                        pcntl_signal_dispatch();
-                    }
-
-                    // Pause for a half a second to conserve system resources
-                    usleep(500000);
-                }
+                pcntl_wait($status);
 
                 if (pcntl_wifexited($status) !== true) {
                     $job->fail(new Resque_Job_DirtyExitException('Job exited abnormally'));

diff --git a/lib/ResqueScheduler/Worker.php b/lib/ResqueScheduler/Worker.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(ticks=1);
-
 /**
  * ResqueScheduler worker to handle scheduling of delayed tasks.
  *