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

Merge branch 'master' of git.icinga.org:icinga2 

Conflicts:
	components/compatido/compatidocomponent.cpp
This commit is contained in:
Michael Friedrich 2012-10-08 10:33:25 +02:00
parent f9c4543112 4f450a464c
commit c63a9da326
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/compatido/compatidocomponent.cpp
View File

@ -26,6 +26,10 @@ const String CompatIdoComponent::DefaultSocketPort = "5668";
const String CompatIdoComponent::DefaultInstanceName = "i2-default";
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
@ -313,7 +317,7 @@ void CompatIdoComponent::SendHello(String instancename, bool sockettype)
<< "HELLO" << "\n"
<< "PROTOCOL" << ": " << COMPATIDO_PROTOCOL<< "\n"
<< "AGENT" << ": " << COMPATIDO_NAME << "\n"
<< "AGENTVERSION" << ": " << COMPATIDO_RELEASE_VERSION << "\n"
<< "AGENTVERSION" << ": " << VERSION << "\n"
<< "STARTTIME" << ": " << static_cast<int>(Utility::GetTime()) << "\n"
<< "DISPOSITION" << ": " << "REALTIME" << "\n"
<< "CONNECTION" << ": " << connection << "\n"