tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 22:54:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implemented --version and made --help output prettier.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-02-03 01:21:11 +01:00
parent d853bcb286
commit 5774792a23
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
icinga-app/icinga.cpp
View File

@ -70,15 +70,10 @@ int main(int argc, char **argv)
Application::SetPkgDataDir(ICINGA_PKGDATADIR); Application::SetPkgDataDir(ICINGA_PKGDATADIR);
#endif /* ICINGA_PKGDATADIR */ #endif /* ICINGA_PKGDATADIR */
Logger::Write(LogInformation, "icinga-app", "Icinga application loader"
#ifndef _WIN32
" (version: " ICINGA_VERSION ")"
#endif /* _WIN32 */
);
po::options_description desc("Supported options"); po::options_description desc("Supported options");
desc.add_options() desc.add_options()
("help,h", "show this help message") ("help,h", "show this help message")
("version,V", "show version information")
("library,l", po::value<vector<String> >(), "load a library") ("library,l", po::value<vector<String> >(), "load a library")
("include,I", po::value<vector<String> >(), "add include search directory") ("include,I", po::value<vector<String> >(), "add include search directory")
("config,c", po::value<vector<String> >(), "parse a configuration file") ("config,c", po::value<vector<String> >(), "parse a configuration file")
@ -91,7 +86,7 @@ int main(int argc, char **argv)
try { try {
po::store(po::parse_command_line(argc, argv, desc), vm); po::store(po::parse_command_line(argc, argv, desc), vm);
} catch (const po::unknown_option& ex) { } catch (const exception& ex) {
stringstream msgbuf; stringstream msgbuf;
msgbuf << "Error while parsing command-line options: " << ex.what(); msgbuf << "Error while parsing command-line options: " << ex.what();
Logger::Write(LogCritical, "icinga-app", msgbuf.str()); Logger::Write(LogCritical, "icinga-app", msgbuf.str());
@ -103,11 +98,35 @@ int main(int argc, char **argv)
if (vm.count("debug")) if (vm.count("debug"))
Application::SetDebugging(true); Application::SetDebugging(true);
if (vm.count("help") || vm.count("version")) {
std::cout << "Icinga application loader"
#ifndef _WIN32
<< " (version: " << ICINGA_VERSION << ")"
#endif /* _WIN32 */
<< std::endl
<< "Copyright (c) 2012-2013 Icinga Development Team (http://www.icinga.org)" << std::endl
<< "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl2.html>" << std::endl
<< "This is free software: you are free to change and redistribute it." << std::endl
<< "There is NO WARRANTY, to the extent permitted by law." << std::endl;
if (vm.count("version"))
return EXIT_SUCCESS;
}
if (vm.count("help")) { if (vm.count("help")) {
std::cout << desc << "\n"; std::cout << std::endl
<< desc << std::endl
<< "Report bugs at <https://dev.icinga.org/>" << std::endl
<< "Icinga home page: <http://www.icinga.org/>" << std::endl;
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
Logger::Write(LogInformation, "icinga-app", "Icinga application loader"
#ifndef _WIN32
" (version: " ICINGA_VERSION ")"
#endif /* _WIN32 */
);
Component::AddSearchDir(Application::GetPkgLibDir()); Component::AddSearchDir(Application::GetPkgLibDir());
Utility::LoadIcingaLibrary("icinga", false); Utility::LoadIcingaLibrary("icinga", false);

2
lib/base/dynamicobject.cpp
View File

@ -423,7 +423,7 @@ void DynamicObject::RestoreObjects(const String& filename)
stringstream msgbuf; stringstream msgbuf;
msgbuf << "Restored " << restored << " objects"; msgbuf << "Restored " << restored << " objects";
Logger::Write(LogInformation, "base", msgbuf.str()); Logger::Write(LogDebug, "base", msgbuf.str());
} }
void DynamicObject::DeactivateObjects(void) void DynamicObject::DeactivateObjects(void)

2
lib/icinga/icingaapplication.cpp
View File

@ -52,7 +52,7 @@ IcingaApplication::IcingaApplication(const Dictionary::Ptr& serializedUpdate)
*/ */
int IcingaApplication::Main(void) int IcingaApplication::Main(void)
{ {
Logger::Write(LogInformation, "icinga", "In IcingaApplication::Main()"); Logger::Write(LogDebug, "icinga", "In IcingaApplication::Main()");
m_StartTime = Utility::GetTime(); m_StartTime = Utility::GetTime();