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 #6285 from Icinga/feature/config-validation-timestamps 

Add support for config validation log timestamps
This commit is contained in:
Jean Flach 2018-05-03 14:22:39 +02:00 committed by GitHub
parent 160e328fba e606a443b7
commit 88dc230294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icinga-app/icinga.cpp
View File

@ -476,7 +476,7 @@ static int Main()
&GlobalArgumentCompletion, true, autoindex); &GlobalArgumentCompletion, true, autoindex);
rc = 0; rc = 0;
} else if (command) { } else if (command) {
Logger::DisableTimestamp(true); Logger::DisableTimestamp();
#ifndef _WIN32 #ifndef _WIN32
if (command->GetImpersonationLevel() == ImpersonateRoot) { if (command->GetImpersonationLevel() == ImpersonateRoot) {
if (getuid() != 0) { if (getuid() != 0) {

9
lib/base/logger.cpp
View File

@ -173,9 +173,14 @@ LogSeverity Logger::GetConsoleLogSeverity()
return m_ConsoleLogSeverity; 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() bool Logger::IsTimestampEnabled()

3
lib/base/logger.hpp
View File

@ -84,7 +84,8 @@ public:
static void DisableConsoleLog(); static void DisableConsoleLog();
static void EnableConsoleLog(); static void EnableConsoleLog();
static bool IsConsoleLogEnabled(); static bool IsConsoleLogEnabled();
static void DisableTimestamp(bool); static void DisableTimestamp();
static void EnableTimestamp();
static bool IsTimestampEnabled(); static bool IsTimestampEnabled();
static void SetConsoleLogSeverity(LogSeverity logSeverity); static void SetConsoleLogSeverity(LogSeverity logSeverity);

3
lib/cli/daemoncommand.cpp
View File

@ -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 int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::string>& ap) const
{ {
if (!vm.count("validate")) Logger::EnableTimestamp();
Logger::DisableTimestamp(false);
Log(LogInformation, "cli") Log(LogInformation, "cli")
<< "Icinga application loader (version: " << Application::GetAppVersion() << "Icinga application loader (version: " << Application::GetAppVersion()