mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-22 13:14:32 +02:00
Merge branch 'master' of git.icinga.org:icinga2
Conflicts: components/compatido/compatidocomponent.cpp
This commit is contained in:
commit
c63a9da326
@ -26,6 +26,10 @@ const String CompatIdoComponent::DefaultSocketPort = "5668";
|
|||||||
const String CompatIdoComponent::DefaultInstanceName = "i2-default";
|
const String CompatIdoComponent::DefaultInstanceName = "i2-default";
|
||||||
const int CompatIdoComponent::DefaultReconnectInterval = 15;
|
const int CompatIdoComponent::DefaultReconnectInterval = 15;
|
||||||
|
|
||||||
|
#define PROGRAM_MODIFICATION_DATE "10-17-2012"
|
||||||
|
#ifndef VERSION
|
||||||
|
# define VERSION "2.0"
|
||||||
|
#endif /* VERSION */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reads the socket address from the config
|
* Reads the socket address from the config
|
||||||
@ -313,7 +317,7 @@ void CompatIdoComponent::SendHello(String instancename, bool sockettype)
|
|||||||
<< "HELLO" << "\n"
|
<< "HELLO" << "\n"
|
||||||
<< "PROTOCOL" << ": " << COMPATIDO_PROTOCOL<< "\n"
|
<< "PROTOCOL" << ": " << COMPATIDO_PROTOCOL<< "\n"
|
||||||
<< "AGENT" << ": " << COMPATIDO_NAME << "\n"
|
<< "AGENT" << ": " << COMPATIDO_NAME << "\n"
|
||||||
<< "AGENTVERSION" << ": " << COMPATIDO_RELEASE_VERSION << "\n"
|
<< "AGENTVERSION" << ": " << VERSION << "\n"
|
||||||
<< "STARTTIME" << ": " << static_cast<int>(Utility::GetTime()) << "\n"
|
<< "STARTTIME" << ": " << static_cast<int>(Utility::GetTime()) << "\n"
|
||||||
<< "DISPOSITION" << ": " << "REALTIME" << "\n"
|
<< "DISPOSITION" << ": " << "REALTIME" << "\n"
|
||||||
<< "CONNECTION" << ": " << connection << "\n"
|
<< "CONNECTION" << ": " << connection << "\n"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user