tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 21:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make PID path configurable.

Browse Source
This commit is contained in:
Gunnar Beutner 2012-07-13 08:30:20 +02:00
parent 9104bdd8da
commit e5ae9dd94e
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/icinga2-config.odt
View File

Binary file not shown.

18
icinga/icingaapplication.cpp
View File

@ -28,7 +28,11 @@
using namespace icinga; using namespace icinga;
const string IcingaApplication::PidFilename = "icinga.pid"; const string IcingaApplication::DefaultPidPath = "icinga.pid";
IcingaApplication::IcingaApplication(void)
: m_PidPath(DefaultPidPath)
{ }
/** /**
* The entry point for the Icinga application. * The entry point for the Icinga application.
@ -49,8 +53,6 @@ int IcingaApplication::Main(const vector<string>& args)
time(&m_StartTime); time(&m_StartTime);
UpdatePidFile(PidFilename);
if (args.size() < 2) { if (args.size() < 2) {
stringstream msgbuf; stringstream msgbuf;
msgbuf << "Syntax: " << args[0] << " [-S] [-L logfile] [-d] [--] <config-file>"; msgbuf << "Syntax: " << args[0] << " [-S] [-L logfile] [-d] [--] <config-file>";
@ -155,6 +157,9 @@ int IcingaApplication::Main(const vector<string>& args)
icingaConfig->GetProperty("ca", &m_CAFile); icingaConfig->GetProperty("ca", &m_CAFile);
icingaConfig->GetProperty("node", &m_Node); icingaConfig->GetProperty("node", &m_Node);
icingaConfig->GetProperty("service", &m_Service); icingaConfig->GetProperty("service", &m_Service);
icingaConfig->GetProperty("pidpath", &m_PidPath);
UpdatePidFile(GetPidPath());
if (!GetCertificateFile().empty() && !GetCAFile().empty()) { if (!GetCertificateFile().empty() && !GetCAFile().empty()) {
/* set up SSL context */ /* set up SSL context */
@ -176,7 +181,7 @@ int IcingaApplication::Main(const vector<string>& args)
Logger::Write(LogInformation, "icinga", "Daemonizing."); Logger::Write(LogInformation, "icinga", "Daemonizing.");
ClosePidFile(); ClosePidFile();
Utility::Daemonize(); Utility::Daemonize();
UpdatePidFile(PidFilename); UpdatePidFile(GetPidPath());
Logger::UnregisterLogger(consoleLogger); Logger::UnregisterLogger(consoleLogger);
} }
@ -234,6 +239,11 @@ string IcingaApplication::GetService(void) const
return m_Service; return m_Service;
} }
string IcingaApplication::GetPidPath(void) const
{
return m_PidPath;
}
time_t IcingaApplication::GetStartTime(void) const time_t IcingaApplication::GetStartTime(void) const
{ {
return m_StartTime; return m_StartTime;

6
icinga/icingaapplication.h
View File

@ -34,6 +34,8 @@ public:
typedef shared_ptr<IcingaApplication> Ptr; typedef shared_ptr<IcingaApplication> Ptr;
typedef weak_ptr<IcingaApplication> WeakPtr; typedef weak_ptr<IcingaApplication> WeakPtr;
IcingaApplication(void);
int Main(const vector<string>& args); int Main(const vector<string>& args);
static IcingaApplication::Ptr GetInstance(void); static IcingaApplication::Ptr GetInstance(void);
@ -42,16 +44,18 @@ public:
string GetCAFile(void) const; string GetCAFile(void) const;
string GetNode(void) const; string GetNode(void) const;
string GetService(void) const; string GetService(void) const;
string GetPidPath(void) const;
time_t GetStartTime(void) const; time_t GetStartTime(void) const;
static const string PidFilename; static const string DefaultPidPath;
private: private:
string m_CertificateFile; string m_CertificateFile;
string m_CAFile; string m_CAFile;
string m_Node; string m_Node;
string m_Service; string m_Service;
string m_PidPath;
time_t m_StartTime; time_t m_StartTime;