tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6430 from Icinga/fix/workqueue-log-message 

Fix negative 'empty in' value in WorkQueue log message
This commit is contained in:
Michael Friedrich 2018-07-26 09:59:53 +02:00 committed by GitHub
parent 89d42fee72 4170bd5205
commit 62e91e1891
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/base/workqueue.cpp
View File

@ -24,6 +24,7 @@
#include "base/application.hpp" #include "base/application.hpp"
#include "base/exception.hpp" #include "base/exception.hpp"
#include <boost/thread/tss.hpp> #include <boost/thread/tss.hpp>
#include <math.h>
using namespace icinga; using namespace icinga;
@ -221,7 +222,7 @@ void WorkQueue::StatusTimerHandler()
if (pending > GetTaskCount(5)) { if (pending > GetTaskCount(5)) {
timeInfo = " empty in "; timeInfo = " empty in ";
if (timeToZero < 0) if (timeToZero < 0 || std::isinf(timeToZero))
timeInfo += "infinite time, your task handler isn't able to keep up"; timeInfo += "infinite time, your task handler isn't able to keep up";
else else
timeInfo += Utility::FormatDuration(timeToZero); timeInfo += Utility::FormatDuration(timeToZero);