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

More bugfixes.

This commit is contained in:
Gunnar Beutner 2012-06-12 11:24:02 +02:00
parent 0270d9cf52
commit 900e65d009
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/configobject.cpp
View File

@ -68,9 +68,9 @@ void ConfigObject::SetLocal(bool value)
bool ConfigObject::IsLocal(void) const
{
bool value;
bool value = false;
GetProperties()->GetProperty("__local", &value);
return (value != 0);
return value;
}
void ConfigObject::SetAbstract(bool value)
@ -80,9 +80,9 @@ void ConfigObject::SetAbstract(bool value)
bool ConfigObject::IsAbstract(void) const
{
long value;
bool value = false;
GetProperties()->GetProperty("__abstract", &value);
return (value != 0);
return value;
}
void ConfigObject::Commit(void)

4
base/observable.h
View File

@ -74,8 +74,8 @@ public:
*/
void operator()(const TArgs& args)
{
vector<ObserverType>::size_type i = 0;
for (i = 0; i < m_Observers.size(); i++) {
typename vector<ObserverType>::size_type i = 0;
for (i = 0; i < m_Observers.size(); ) {
int result = m_Observers[i](args);
if (result == -1)

1
icinga/icingaapplication.cpp
View File

@ -62,6 +62,7 @@ int IcingaApplication::Main(const vector<string>& args)
/* load config file */
ConfigObject::Ptr fileComponentConfig = make_shared<ConfigObject>("component", "configfile");
fileComponentConfig->SetLocal(true);
fileComponentConfig->SetProperty("configFilename", args[1]);
fileComponentConfig->Commit();