Bug 1517606 - Prevent infinite loops by making workers die after 5 minutes

diff --git a/Bugzilla/JobQueue.pm b/Bugzilla/JobQueue.pm
index c2c5827a3f5bdf6de378d53b3cf6372ffd2bd163..792883de33bb8305e6490549303346bd909f3fe0 100644 (file)
--- a/Bugzilla/JobQueue.pm
+++ b/Bugzilla/JobQueue.pm
@@ -130,7 +130,11 @@ sub work {
     first_interval => 0,
     interval       => $delay,
     reschedule     => 'drift',
-    on_tick        => sub { $self->work_once }
+    on_tick        => sub {
+      alarm(60 * 5);
+      $self->work_once;
+      alarm(0);
+    }
   );
   DEBUG("working every $delay seconds");
   $loop->add($timer);

diff --git a/jobqueue-worker.pl b/jobqueue-worker.pl
index 298185d4026a71b91f967923e8b71ee05c73535a..42e8f3424a1b3f1b534e9bc3784179be51d77e1d 100755 (executable)
--- a/jobqueue-worker.pl
+++ b/jobqueue-worker.pl
@@ -18,7 +18,6 @@ BEGIN {
   my $dir = rel2abs(dirname(__FILE__));
   lib->import($dir, catdir($dir, 'lib'), catdir($dir, qw(local lib perl5)));
   chdir $dir or die "chdir $dir failed: $!";
-
 }
 
 use Bugzilla::JobQueue::Worker;