Change log level for some messages.

Fixes #6072

diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index b086886fb1b62877056558387032cad973add2e5..a050ecc131f9e958482484cb379a4dd66a894b33 100644 (file)
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -239,8 +239,6 @@ void CheckerComponent::ExecuteCheckHelper(const Checkable::Ptr& checkable)
 
 void CheckerComponent::ResultTimerHandler(void)
 {
-       Log(LogDebug, "checker", "ResultTimerHandler entered.");
-
        std::ostringstream msgbuf;
 
        {
@@ -249,7 +247,7 @@ void CheckerComponent::ResultTimerHandler(void)
                msgbuf << "Pending checkables: " << m_PendingCheckables.size() << "; Idle checkables: " << m_IdleCheckables.size() << "; Checks/s: " << CIB::GetActiveChecksStatistics(5) / 5.0;
        }
 
-       Log(LogInformation, "checker", msgbuf.str());
+       Log(LogDebug, "checker", msgbuf.str());
 }
 
 void CheckerComponent::ObjectHandler(const DynamicObject::Ptr& object)

diff --git a/components/compat/statusdatawriter.cpp b/components/compat/statusdatawriter.cpp
index ea9fe55151fe0d7c8f466811f60adfb9cbcb36bc..8ae61a4622f460f757eabb3b0963739c550e67f2 100644 (file)
--- a/components/compat/statusdatawriter.cpp
+++ b/components/compat/statusdatawriter.cpp
@@ -747,7 +747,7 @@ void StatusDataWriter::UpdateObjectsCache(void)
  */
 void StatusDataWriter::StatusTimerHandler(void)
 {
-       Log(LogInformation, "compat", "Writing status.dat file");
+       double start = Utility::GetTime();
 
        String statuspath = GetStatusPath();
        String statuspathtmp = statuspath + ".tmp"; /* XXX make this a global definition */
@@ -818,6 +818,5 @@ void StatusDataWriter::StatusTimerHandler(void)
                    << boost::errinfo_file_name(statuspathtmp));
        }
 
-       Log(LogInformation, "compat", "Finished writing status.dat file");
+       Log(LogInformation, "compat", "Writing status.dat file took " + Utility::FormatDuration(Utility::GetTime() - start));
 }
-

diff --git a/lib/base/process.cpp b/lib/base/process.cpp
index e17227f4a0d64f51e5912793ed7a810a35df5a80..6cc886c6232107852c2be1558ee566d1c9fbbf1d 100644 (file)
--- a/lib/base/process.cpp
+++ b/lib/base/process.cpp
@@ -378,7 +378,7 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
        m_Process = pi.hProcess;
        m_FD = outReadPipe;
 
-       Log(LogDebug, "base", "Running command '" + m_Arguments +
+       Log(LogInformation, "base", "Running command '" + m_Arguments +
                "': PID " + Convert::ToString(pi.dwProcessId));
 
 #else /* _WIN32 */
@@ -476,7 +476,7 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
 
        // parent process
 
-       Log(LogDebug, "base", "Running command '" + boost::algorithm::join(m_Arguments, " ") +
+       Log(LogInformation, "base", "Running command '" + boost::algorithm::join(m_Arguments, " ") +
                "': PID " + Convert::ToString(m_Process));
 
        m_Arguments.clear();

diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp
index 6aa341938287d3987260acc1c4b3cb48e83a888b..452f1a7b04e32292ee8a385240e214a58f735ebe 100644 (file)
--- a/lib/base/threadpool.cpp
+++ b/lib/base/threadpool.cpp
@@ -323,7 +323,7 @@ void ThreadPool::ManagerThreadProc(void)
                                << (long)(total_avg_latency * 1000 / (sizeof(m_Queues) / sizeof(m_Queues[0]))) << "ms"
                                << "; Threads: " << total_alive
                                << "; Pool utilization: " << (total_utilization / (sizeof(m_Queues) / sizeof(m_Queues[0]))) << "%";
-                       Log(LogInformation, "base", msgbuf.str());
+                       Log(LogDebug, "base", msgbuf.str());
                }
        }
 }

diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
index 56559fea22eb2ff9259652753cbb1464688dd255..71ae2d7a033ca419e3eef014b66b688b558c5bb4 100644 (file)
--- a/lib/base/utility.cpp
+++ b/lib/base/utility.cpp
@@ -743,6 +743,14 @@ String Utility::FormatDuration(int duration)
                tokens.push_back(Convert::ToString(seconds) + (seconds != 1 ? " seconds" : " second"));
        }
 
+       if (tokens.size() == 0) {
+               int milliseconds = floor(duration * 1000);
+               if (milliseconds >= 1)
+                       tokens.push_back(Convert::ToString(milliseconds) + (milliseconds != 1 ? " milliseconds" : " millisecond"));
+               else
+                       tokens.push_back("less than 1 millisecond");
+       }
+
        return NaturalJoin(tokens);
 }
 

diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp
index 503285e6646cdeafe2a143ae2ad0ad9c4cafb306..0f26fd1cbb72d0c612b82976ed6e6318acd553a0 100644 (file)
--- a/lib/base/workqueue.cpp
+++ b/lib/base/workqueue.cpp
@@ -123,7 +123,7 @@ void WorkQueue::StatusTimerHandler(void)
 {
        boost::mutex::scoped_lock lock(m_Mutex);
 
-       Log(LogInformation, "base", "WQ #" + Convert::ToString(m_ID) + " items: " + Convert::ToString(m_Items.size()));
+       Log(LogDebug, "base", "WQ #" + Convert::ToString(m_ID) + " items: " + Convert::ToString(m_Items.size()));
 }
 
 void WorkQueue::WorkerThreadProc(void)