135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix worker restart to happen once per hour per day

Browse Source
This commit is contained in:
Oliver Gorwits
2014-11-14 21:44:48 +00:00
parent db9775780b
commit 445d26bb31
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/Changes
View File

@@ -1,4 +1,4 @@
2.029013_001 - 2014-11-13 2.029013_002 - 2014-11-14
[ENHANCEMENTS] [ENHANCEMENTS]

5
Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm
View File

@@ -10,6 +10,8 @@ use namespace::clean;
use App::Netdisco::JobQueue qw/jq_defer jq_complete/; use App::Netdisco::JobQueue qw/jq_defer jq_complete/;
sub worker_begin { (shift)->{started} = time }
sub worker_body { sub worker_body {
my $self = shift; my $self = shift;
my $wid = $self->wid; my $wid = $self->wid;
@@ -42,7 +44,8 @@ sub worker_body {
# restart worker once a day. # restart worker once a day.
# relies on the worker seeing a job at least every hour. # relies on the worker seeing a job at least every hour.
my $hour = [localtime()]->[2]; my $hour = [localtime()]->[2];
if ($wid and (($wid % 24) == $hour)) { if ($wid and (time >= ($self->{started} + 86400))
and ($hour == ($wid % 24))) {
$self->exit(0, "recycling worker $wid"); $self->exit(0, "recycling worker $wid");
} }
} }