From e752befa78b81d02145666d3d24717c3a02a1627 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 24 Feb 2013 01:14:18 +0000 Subject: [PATCH] fix bug in assuming num_workers included manager --- Netdisco/bin/netdisco-daemon-fg | 1 - Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Netdisco/bin/netdisco-daemon-fg b/Netdisco/bin/netdisco-daemon-fg index 27de63f2..fbe04cb0 100755 --- a/Netdisco/bin/netdisco-daemon-fg +++ b/Netdisco/bin/netdisco-daemon-fg @@ -56,7 +56,6 @@ sub build_tasks_list { return $tasks; } -# includes the Manager worker sub num_workers { return (setting('daemon_pollers') + setting('daemon_interactives')); } diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm index c7609315..686e8286 100644 --- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm @@ -32,7 +32,7 @@ sub worker_begin { sub worker_body { my $self = shift; - my $num_slots = $self->do('num_workers') - 1; + my $num_slots = $self->do('num_workers'); # get some pending jobs my $rs = schema('netdisco')->resultset('Admin')