[Nagios-checkins] SF.net SVN: nagios:[2525] nagioscore/trunk/base/workers.c

[<ag...@us...>]

Revision: 2525
          http://nagios.svn.sourceforge.net/nagios/?rev=2525&view=rev
Author:   ageric
Date:     2012-12-13 15:40:53 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
core: Make loadctl work again

It's funny how much headache a typo can make, and especially when
it's an arrow pointing in the wrong direction. It could, for example
mean the difference between life and death if it's a roadsign. In
this case, it wasn't quite as earthshattering as all that, but we did
manage to hog 100% of one cpu by never (ever) running an event and
iterating over the event queue almost as fast as we run out of beer
at the office. All because an arrow was pointing the wrong way.

I really should test things like that, but how fun would life be
without surprises?

Signed-off-by: Andreas Ericsson <ae...@op...>

Modified Paths:
--------------
    nagioscore/trunk/base/workers.c

Modified: nagioscore/trunk/base/workers.c
===================================================================
--- nagioscore/trunk/base/workers.c	2012-12-12 17:36:56 UTC (rev 2524)
+++ nagioscore/trunk/base/workers.c	2012-12-13 15:40:53 UTC (rev 2525)
@@ -87,7 +87,7 @@
 		lc->last_check = now;
 
 		if (getloadavg(lc->load, 3) < 0)
-			return lc->jobs_limit < lc->jobs_running;
+			return lc->jobs_limit > lc->jobs_running;
 
 		if (lc->load[0] > lc->backoff_limit) {
 			old = lc->jobs_limit;
@@ -116,7 +116,7 @@
 		}
 	}
 
-	return lc->jobs_limit < lc->jobs_running;
+	return lc->jobs_limit > lc->jobs_running;
 }
 
 static worker_job *create_job(int type, void *arg, time_t timeout, const char *command)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.