From 724ff68946e6393215f105acc532cc1c81bc74ab Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 27 Feb 2017 14:39:09 +0000 Subject: [PATCH] #296 Fix occasional empty macsuck when run in daemon --- Netdisco/Changes | 4 ++++ Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Netdisco/Changes b/Netdisco/Changes index 3423c254..d474428b 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -4,6 +4,10 @@ * #27 add SNMP tips for Huawei, CloudEngine, Linksys (stoatwblr) + [BUG FIXES] + + * #296 Fix occasional empty macsuck when run in daemon + 2.034002 - 2017-01-06 [ENHANCEMENTS] diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm index 4126e263..4ae6ce1d 100644 --- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm @@ -40,15 +40,7 @@ sub worker_body { }; $self->close_job($job); - - # restart worker once a day. - my $hour = [localtime()]->[2]; - if ($wid) { - if ((time >= ($self->{started} + 86400) and $hour == ($wid % 24)) - or (time > ($self->{started} + 172800))) { - $self->exit(0, "recycling worker $wid"); - } - } + $self->exit(0); # recycle worker } }