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

Removed ConfigVM class.

This commit is contained in:
Gunnar Beutner 2012-07-06 11:35:20 +02:00
parent 9b7251abb9
commit e0bf25e907
5 changed files with 8 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/configfile/configfilecomponent.cpp
View File

@ -38,7 +38,14 @@ void ConfigFileComponent::Start(void)
throw logic_error("Missing 'configFilename' property");
vector<ConfigItem::Ptr> configItems = ConfigCompiler::CompileFile(filename);
ConfigVM::ExecuteItems(configItems);
Application::Log(LogInformation, "configfile", "Executing config items...");
vector<ConfigItem::Ptr>::iterator it;
for (it = configItems.begin(); it != configItems.end(); it++) {
ConfigItem::Ptr item = *it;
item->Commit();
}
}
void ConfigFileComponent::Stop(void)

2
dyn/Makefile.am
View File

@ -11,8 +11,6 @@ AM_YFLAGS = -d
libdyn_la_SOURCES = \
configcompiler.cpp \
configcompiler.h \
configvm.cpp \
configvm.h \
config_lexer.ll \
config_parser.yy \
i2-dyn.h \

34
dyn/configvm.cpp
View File

@ -1,34 +0,0 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "i2-dyn.h"
using namespace icinga;
void ConfigVM::ExecuteItems(const vector<ConfigItem::Ptr>& items)
{
vector<ConfigItem::Ptr>::const_iterator it;
Application::Log(LogInformation, "dyn", "Executing config items...");
for (it = items.begin(); it != items.end(); it++) {
ConfigItem::Ptr obj = *it;
obj->Commit();
}
}

34
dyn/configvm.h
View File

@ -1,34 +0,0 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#ifndef CONFIGVM_H
#define CONFIGVM_H
namespace icinga
{
class I2_DYN_API ConfigVM
{
public:
static void ExecuteItems(const vector<ConfigItem::Ptr>& items);
};
}
#endif /* CONFIGVM_H */

1
dyn/i2-dyn.h
View File

@ -49,6 +49,5 @@ using std::endl;
#include "expressionlist.h"
#include "configitem.h"
#include "configcompiler.h"
#include "configvm.h"
#endif /* I2DYN_H */