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

Fix object initialization order.

This commit is contained in:
Gunnar Beutner 2013-09-10 16:53:11 +02:00
parent 15fae2bf2a
commit 183135dbce
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
icinga-app/icinga.cpp
View File

@ -86,6 +86,19 @@ static bool LoadConfigFiles(bool validateOnly)
if (validateOnly)
return true;
if (Application::GetInstance()) {
Log(LogCritical, "icinga-app", "You must not manually create an Application object.");
return false;
}
ConfigItemBuilder::Ptr builder = boost::make_shared<ConfigItemBuilder>();
builder->SetType(Application::GetApplicationType());
builder->SetName("application");
ConfigItem::Ptr item = builder->Compile();
item->Register();
DynamicObject::Ptr dobj = item->Commit();
dobj->OnConfigLoaded();
ConfigItem::ActivateItems();
ConfigItem::DiscardItems();
@ -321,23 +334,6 @@ int main(int argc, char **argv)
return EXIT_SUCCESS;
}
Application::Ptr app = Application::GetInstance();
if (app) {
Log(LogCritical, "icinga-app", "You must not manually create an Application object.");
return EXIT_FAILURE;
}
ConfigItemBuilder::Ptr builder = boost::make_shared<ConfigItemBuilder>();
builder->SetType(Application::GetApplicationType());
builder->SetName("application");
ConfigItem::Ptr item = builder->Compile();
item->Register();
DynamicObject::Ptr dobj = item->Commit();
dobj->OnConfigLoaded();
dobj->Start();
app = static_pointer_cast<Application>(dobj);
#ifndef _WIN32
struct sigaction sa;
memset(&sa, 0, sizeof(sa));
@ -345,5 +341,5 @@ int main(int argc, char **argv)
sigaction(SIGHUP, &sa, NULL);
#endif /* _WIN32 */
return app->Run();
return Application::GetInstance()->Run();
}