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

Change behaviour of troubleshoot cli parameters

This commit is contained in:
Jean-Marcel Flach 2015-02-26 13:29:55 +01:00
parent 0c51857084
commit d084effa4b
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/cli/troubleshootcommand.cpp
View File

@ -168,7 +168,7 @@ bool TroubleshootCommand::ObjectInfo(InfoLog& log, const boost::program_options:
} else { } else {
InfoLog *OFile = NULL; InfoLog *OFile = NULL;
if (vm.count("include-objects")) { if (vm.count("include-objects")) {
OFile = new InfoLog(path+"-objects", vm.count("console")); OFile = new InfoLog(path+"-objects", false);
if (!OFile->GetStreamHealth()) { if (!OFile->GetStreamHealth()) {
InfoLogLine(log, LogWarning) InfoLogLine(log, LogWarning)
<< "Failed to open Object-write-stream, not printing objects\n"; << "Failed to open Object-write-stream, not printing objects\n";
@ -547,24 +547,23 @@ void TroubleshootCommand::InitParameters(boost::program_options::options_descrip
int TroubleshootCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const int TroubleshootCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
{ {
String path; #ifdef _WIN32 //Dislikes ':' in filenames
String path = Application::GetLocalStateDir() + "/log/icinga2/troubleshooting-"
+ Utility::FormatDateTime("%Y-%m-%d_%H-%M-%S", Utility::GetTime()) + ".log";
#else
String path = Application::GetLocalStateDir() + "/log/icinga2/troubleshooting-"
+ Utility::FormatDateTime("%Y-%m-%d_%H:%M:%S", Utility::GetTime()) + ".log";
#endif /*_WIN32*/
InfoLog *log; InfoLog *log;
Logger::SetConsoleLogSeverity(LogWarning); Logger::SetConsoleLogSeverity(LogWarning);
if (vm.count("output"))
path = vm["output"].as<std::string>();
if (vm.count("console")) { if (vm.count("console")) {
log = new InfoLog("", true); log = new InfoLog("", true);
} else { } else {
if (vm.count("output"))
path = vm["output"].as<std::string>();
else {
#ifdef _WIN32 //Dislikes ':' in filenames
path = Application::GetLocalStateDir() + "/log/icinga2/troubleshooting-"
+ Utility::FormatDateTime("%Y-%m-%d_%H-%M-%S", Utility::GetTime()) + ".log";
#else
path = Application::GetLocalStateDir() + "/log/icinga2/troubleshooting-"
+ Utility::FormatDateTime("%Y-%m-%d_%H:%M:%S", Utility::GetTime()) + ".log";
#endif /*_WIN32*/
}
log = new InfoLog(path, false); log = new InfoLog(path, false);
if (!log->GetStreamHealth()) { if (!log->GetStreamHealth()) {
Log(LogCritical, "troubleshoot", "Failed to open file to write: " + path); Log(LogCritical, "troubleshoot", "Failed to open file to write: " + path);