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

Removed rpclistener/rpcconnection config object types.

This commit is contained in:
Gunnar Beutner 2012-05-08 12:03:24 +02:00
parent b2f440d2cb
commit 1573c19aaa
5 changed files with 12 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/discovery/discoverycomponent.cpp
View File

@ -44,6 +44,7 @@ void DiscoveryComponent::Start(void)
GetEndpointManager()->RegisterEndpoint(m_DiscoveryEndpoint);
/* create the reconnect timer */
m_DiscoveryTimer = make_shared<Timer>();
m_DiscoveryTimer->SetInterval(30);
m_DiscoveryTimer->OnTimerExpired += bind_weak(&DiscoveryComponent::DiscoveryTimerHandler, shared_from_this());

3
icinga-app/icinga1.conf
View File

@ -12,8 +12,5 @@
"configrpc": { "replicate": "0", "configSource": "1" },
"demo": { "replicate": "0" },
"discovery": { "replicate": "0", "broker": "1" }
},
"rpclistener": {
"kekslistener": { "replicate": "0", "service": "7777" }
}
}

3
icinga-app/icinga2.conf
View File

@ -13,9 +13,6 @@
"demo": { "replicate": "0" },
"discovery": { "replicate": "0", "broker": "0" }
},
"rpclistener": {
"kekslistener": { "replicate": "0", "service": "8888" }
},
"broker": {
"icinga-c1": { "replicate": "0", "node": "10.0.10.3", "service": "7777" }
}

3
icinga-app/icinga3.conf
View File

@ -13,9 +13,6 @@
"demo": { "replicate": "0" },
"discovery": { "replicate": "0", "broker": "0" }
},
"rpclistener": {
"kekslistener": { "replicate": "0", "service": "9999" }
},
"broker": {
"icinga-c1": { "replicate": "0", "node": "10.0.10.3", "service": "7777" }
}

83
icinga/icingaapplication.cpp
View File

@ -27,13 +27,6 @@ int IcingaApplication::Main(const vector<string>& args)
string componentDirectory = GetExeDirectory() + "/../lib/icinga";
AddComponentSearchDir(componentDirectory);
/* register handler for 'component' config objects */
ConfigCollection::Ptr componentCollection = GetConfigHive()->GetCollection("component");
function<int (const EventArgs&)> NewComponentHandler = bind_weak(&IcingaApplication::NewComponentHandler, shared_from_this());
componentCollection->OnObjectCreated += NewComponentHandler;
componentCollection->ForEachObject(NewComponentHandler);
componentCollection->OnObjectRemoved += bind_weak(&IcingaApplication::DeletedComponentHandler, shared_from_this());
/* register handler for 'icinga' config objects */
ConfigCollection::Ptr icingaCollection = GetConfigHive()->GetCollection("icinga");
function<int (const EventArgs&)> NewIcingaConfigHandler = bind_weak(&IcingaApplication::NewIcingaConfigHandler, shared_from_this());
@ -41,6 +34,13 @@ int IcingaApplication::Main(const vector<string>& args)
icingaCollection->ForEachObject(NewIcingaConfigHandler);
icingaCollection->OnObjectRemoved += bind_weak(&IcingaApplication::DeletedIcingaConfigHandler, shared_from_this());
/* register handler for 'component' config objects */
ConfigCollection::Ptr componentCollection = GetConfigHive()->GetCollection("component");
function<int (const EventArgs&)> NewComponentHandler = bind_weak(&IcingaApplication::NewComponentHandler, shared_from_this());
componentCollection->OnObjectCreated += NewComponentHandler;
componentCollection->ForEachObject(NewComponentHandler);
componentCollection->OnObjectRemoved += bind_weak(&IcingaApplication::DeletedComponentHandler, shared_from_this());
/* load config file */
ConfigObject::Ptr fileComponentConfig = make_shared<ConfigObject>("component", "configfile");
fileComponentConfig->SetPropertyString("configFilename", args[1]);
@ -65,19 +65,10 @@ int IcingaApplication::Main(const vector<string>& args)
shared_ptr<SSL_CTX> sslContext = Utility::MakeSSLContext(GetPublicKeyFile(), GetPrivateKeyFile(), GetCAKeyFile());
m_EndpointManager->SetSSLContext(sslContext);
/* register handler for 'rpclistener' config objects */
ConfigCollection::Ptr listenerCollection = GetConfigHive()->GetCollection("rpclistener");
function<int (const EventArgs&)> NewRpcListenerHandler = bind_weak(&IcingaApplication::NewRpcListenerHandler, shared_from_this());
listenerCollection->OnObjectCreated += NewRpcListenerHandler;
listenerCollection->ForEachObject(NewRpcListenerHandler);
listenerCollection->OnObjectRemoved += bind_weak(&IcingaApplication::DeletedRpcListenerHandler, shared_from_this());
/* register handle for 'rpcconnection' config objects */
ConfigCollection::Ptr connectionCollection = GetConfigHive()->GetCollection("rpcconnection");
function<int (const EventArgs&)> NewRpcConnectionHandler = bind_weak(&IcingaApplication::NewRpcConnectionHandler, shared_from_this());
connectionCollection->OnObjectCreated += NewRpcConnectionHandler;
connectionCollection->ForEachObject(NewRpcConnectionHandler);
connectionCollection->OnObjectRemoved += bind_weak(&IcingaApplication::DeletedRpcConnectionHandler, shared_from_this());
/* create the primary RPC listener */
string service = GetService();
if (!service.empty())
GetEndpointManager()->AddListener(service);
RunEventLoop();
@ -164,58 +155,6 @@ int IcingaApplication::DeletedIcingaConfigHandler(const EventArgs& ea)
return 0;
}
int IcingaApplication::NewRpcListenerHandler(const EventArgs& ea)
{
ConfigObject::Ptr object = static_pointer_cast<ConfigObject>(ea.Source);
/* don't allow replicated config objects */
if (object->GetReplicated())
return 0;
string service;
if (!object->GetPropertyString("service", &service))
throw InvalidArgumentException("Parameter 'service' is required for 'rpclistener' objects.");
GetEndpointManager()->AddListener(service);
return 0;
}
int IcingaApplication::DeletedRpcListenerHandler(const EventArgs& ea)
{
throw Exception("Unsupported operation.");
return 0;
}
int IcingaApplication::NewRpcConnectionHandler(const EventArgs& ea)
{
ConfigObject::Ptr object = static_pointer_cast<ConfigObject>(ea.Source);
/* don't allow replicated config objects */
if (object->GetReplicated())
return 0;
string node;
if (!object->GetPropertyString("node", &node))
throw InvalidArgumentException("Parameter 'node' is required for 'rpcconnection' objects.");
string service;
if (!object->GetPropertyString("service", &service))
throw InvalidArgumentException("Parameter 'service' is required for 'rpcconnection' objects.");
GetEndpointManager()->AddConnection(node, service);
return 0;
}
int IcingaApplication::DeletedRpcConnectionHandler(const EventArgs& ea)
{
throw Exception("Unsupported operation.");
return 0;
}
void IcingaApplication::SetPrivateKeyFile(string privkey)
{
m_PrivateKeyFile = privkey;