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

Fix output formatting in troubleshoot cli command 

refs #3446
This commit is contained in:
Michael Friedrich 2015-03-02 14:37:58 +01:00
parent dd5ca24210
commit 1f9a719712
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/cli/troubleshootcommand.cpp
View File

@ -119,11 +119,11 @@ class TroubleshootCommand::InfoLogLine
{ {
public: public:
InfoLogLine(InfoLog& log, int col = Console_Normal, LogSeverity sev = LogInformation) InfoLogLine(InfoLog& log, int col = Console_Normal, LogSeverity sev = LogInformation)
: m_Log(log), m_colour(col), m_Sev(sev) {} : m_Log(log), m_Sev(sev), m_Color(col) {}
~InfoLogLine(void) ~InfoLogLine(void)
{ {
m_Log.WriteLine(m_Sev, m_colour, m_String.str()); m_Log.WriteLine(m_Sev, m_Color, m_String.str());
} }
template <typename T> template <typename T>
@ -137,7 +137,7 @@ private:
std::ostringstream m_String; std::ostringstream m_String;
InfoLog& m_Log; InfoLog& m_Log;
LogSeverity m_Sev; LogSeverity m_Sev;
int m_colour; int m_Color;
}; };
@ -226,7 +226,7 @@ bool TroubleshootCommand::ObjectInfo(InfoLog& log, const boost::program_options:
<< "Failed to print vars to " << path+"-vars\n"; << "Failed to print vars to " << path+"-vars\n";
} }
} }
InfoLogLine(log) InfoLogLine(log)
<< '\n'; << '\n';
@ -649,7 +649,7 @@ int TroubleshootCommand::Run(const boost::program_options::variables_map& vm, co
InfoLogLine(*log) InfoLogLine(*log)
<< appName << " -- Troubleshooting help:\n" << appName << " -- Troubleshooting help:\n"
<< "Should you run into problems with Icinga please add this file to your help request\n" << "Should you run into problems with Icinga please add this file to your help request\n"
<< "Began procedure at " << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S", goTime) << "\n"; << "Started collection at " << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S", goTime) << "\n";
InfoLogLine(*log, Console_ForegroundMagenta) InfoLogLine(*log, Console_ForegroundMagenta)
<< std::string(52, '=') << "\n\n"; << std::string(52, '=') << "\n\n";
@ -677,19 +677,22 @@ int TroubleshootCommand::Run(const boost::program_options::variables_map& vm, co
<< std::string(52, '=') << '\n'; << std::string(52, '=') << '\n';
InfoLogLine(*log, Console_ForegroundGreen) InfoLogLine(*log, Console_ForegroundGreen)
<< "Finished collection at " << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S", endTime) << "Finished collection at " << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S", endTime)
<< "\nTook " << Utility::FormatDateTime("%S", (endTime - goTime)) << " seconds\n"; << "\nTook " << Convert::ToString(endTime - goTime) << " seconds\n";
if (!vm.count("console")) { if (!vm.count("console")) {
std::cout std::cout << "Started collection at " << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S", goTime) << "\n"
<< "Finished collection. See '" << path << '\''; << "Finished collection at " << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S", endTime)
if (vm.count("include-vars")) << "\nTook " << Convert::ToString(endTime - goTime) << " seconds\n\n";
std::cout
<< " and '" << path << "-vars'"; std::cout << "General log file: '" << path << "'\n";
if (vm.count("include-objects"))
std::cout if (vm.count("include-vars"))
<< " and '" << path << "-objects'"; std::cout << "Vars log file: '" << path << "-vars'\n";
std::cout if (vm.count("include-objects"))
<< "\nPlease compress the files with tar and zip before uploading them\n"; std::cout << "Objects log file: '" << path << "-objects'\n";
std::cout << "\nPlease compress the files before uploading them,, for example:\n"
<< "'tar czf troubleshoot.tar.gz " << path << "*'\n";
} }
delete log; delete log;