Add support for config validation log timestamps

This also adds implicit support for the startup.log
generated from API config package validation, e.g. used by
the Icinga Director.

fixes #3455

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 34aeddb69657e812d9ac5bebe55eeb3aa68f4fa4..c63c1c822f4f21465ce75f87462753d168c44f3b 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -476,7 +476,7 @@ static int Main()
                        &GlobalArgumentCompletion, true, autoindex);
                rc = 0;
        } else if (command) {
-               Logger::DisableTimestamp(true);
+               Logger::DisableTimestamp();
 #ifndef _WIN32
                if (command->GetImpersonationLevel() == ImpersonateRoot) {
                        if (getuid() != 0) {

diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp
index 1ff1d14c4480b65c58673759eb5ae716eda78f42..8c20231fb881af58fb1e20aadc79c8cacb3a9f14 100644 (file)
--- a/lib/base/logger.cpp
+++ b/lib/base/logger.cpp
@@ -173,9 +173,14 @@ LogSeverity Logger::GetConsoleLogSeverity()
        return m_ConsoleLogSeverity;
 }
 
-void Logger::DisableTimestamp(bool disable)
+void Logger::DisableTimestamp()
 {
-       m_TimestampEnabled = !disable;
+       m_TimestampEnabled = false;
+}
+
+void Logger::EnableTimestamp()
+{
+       m_TimestampEnabled = true;
 }
 
 bool Logger::IsTimestampEnabled()

diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp
index 1459e6efa9048e7646dc38b35af5071192d12246..31ed6c82123d347a66948b0b0766d096f9c80879 100644 (file)
--- a/lib/base/logger.hpp
+++ b/lib/base/logger.hpp
@@ -84,7 +84,8 @@ public:
        static void DisableConsoleLog();
        static void EnableConsoleLog();
        static bool IsConsoleLogEnabled();
-       static void DisableTimestamp(bool);
+       static void DisableTimestamp();
+       static void EnableTimestamp();
        static bool IsTimestampEnabled();
 
        static void SetConsoleLogSeverity(LogSeverity logSeverity);

diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index 5b34bc18dc475fe160bf80cccb7b75bcfca655b8..d113dac11357c9986e67e593d27dddd4499c0cd2 100644 (file)
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -183,8 +183,7 @@ std::vector<String> DaemonCommand::GetArgumentSuggestions(const String& argument
  */
 int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::string>& ap) const
 {
-       if (!vm.count("validate"))
-               Logger::DisableTimestamp(false);
+       Logger::EnableTimestamp();
 
        Log(LogInformation, "cli")
                << "Icinga application loader (version: " << Application::GetAppVersion()