Remove unnecessary includes.

Fixes #6189
This commit is contained in:
Gunnar Beutner 2014-05-11 17:14:35 +02:00
parent db07854c76
commit 9c3e399188
132 changed files with 124 additions and 346 deletions

View File

@ -26,6 +26,7 @@
#include "base/dynamictype.h"
#include "base/utility.h"
#include "base/application.h"
#include <boost/foreach.hpp>
using namespace icinga;

View File

@ -28,12 +28,10 @@
#include "base/type.h"
#include "base/convert.h"
#include "base/scriptvariable.h"
#include "base/process.h"
#include "icinga-version.h"
#include <sstream>
#include <boost/algorithm/string/classification.hpp>
#include <boost/thread/thread.hpp>
#include <boost/bind.hpp>
#include <boost/make_shared.hpp>
#include <boost/foreach.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/exception/errinfo_api_function.hpp>
@ -48,7 +46,7 @@ REGISTER_TYPE(Application);
Application *Application::m_Instance = NULL;
bool Application::m_ShuttingDown = false;
bool Application::m_RequestRestart = false;
bool Application::m_Restarting = false;
static bool l_Restarting = false;
bool Application::m_Debugging = false;
int Application::m_ArgC;
char **Application::m_ArgV;
@ -252,10 +250,10 @@ mainloop:
m_RequestRestart = false; // we are now handling the request, once is enough
// are we already restarting? ignore request if we already are
if (m_Restarting)
if (l_Restarting)
goto mainloop;
m_Restarting = true;
l_Restarting = true;
StartReloadProcess();
goto mainloop;
@ -280,6 +278,13 @@ void Application::OnShutdown(void)
/* Nothing to do here. */
}
static void ReloadProcessCallback(const ProcessResult& pr)
{
if (pr.ExitStatus != 0)
Log(LogCritical, "base", "Found error in config: reloading aborted");
l_Restarting = false;
}
void Application::StartReloadProcess(void) const
{
Log(LogInformation, "base", "Got reload command: Starting new instance.");
@ -299,14 +304,7 @@ void Application::StartReloadProcess(void) const
Process::Ptr process = make_shared<Process>(Process::PrepareCommand(args));
process->SetTimeout(300);
process->Run(boost::bind(&Application::ReloadProcessCallback, _1));
}
void Application::ReloadProcessCallback(const ProcessResult& pr)
{
if (pr.ExitStatus != 0)
Log(LogCritical, "base", "Found error in config: reloading aborted");
m_Restarting=false;
process->Run(&ReloadProcessCallback);
}
/**

View File

@ -23,8 +23,6 @@
#include "base/i2-base.h"
#include "base/application.th"
#include "base/threadpool.h"
#include "base/dynamicobject.h"
#include "base/process.h"
namespace icinga
{
@ -124,7 +122,6 @@ private:
static bool m_ShuttingDown; /**< Whether the application is in the process of
shutting down. */
static bool m_RequestRestart;
static bool m_Restarting;
static int m_ArgC; /**< The number of command-line arguments. */
static char **m_ArgV; /**< Command-line arguments. */
FILE *m_PidFile; /**< The PID file */
@ -143,8 +140,6 @@ private:
static void SigAbrtHandler(int signum);
static void ExceptionHandler(void);
static void ReloadProcessCallback(const ProcessResult& pr);
};
}

View File

@ -21,7 +21,6 @@
#include "base/objectlock.h"
#include "base/debug.h"
#include <cJSON.h>
#include <boost/make_shared.hpp>
#include <boost/foreach.hpp>
using namespace icinga;

View File

@ -21,7 +21,6 @@
#include "base/objectlock.h"
#include "base/debug.h"
#include <cJSON.h>
#include <boost/make_shared.hpp>
#include <boost/foreach.hpp>
using namespace icinga;

View File

@ -21,7 +21,6 @@
#include "base/dynamictype.h"
#include "base/serializer.h"
#include "base/netstring.h"
#include "base/registry.h"
#include "base/stdiostream.h"
#include "base/debug.h"
#include "base/objectlock.h"
@ -31,7 +30,6 @@
#include "base/initialize.h"
#include "base/scriptvariable.h"
#include <fstream>
#include <boost/make_shared.hpp>
#include <boost/foreach.hpp>
#include <boost/exception/errinfo_api_function.hpp>
#include <boost/exception/errinfo_errno.hpp>
@ -40,7 +38,6 @@
using namespace icinga;
REGISTER_TYPE(DynamicObject);
INITIALIZE_ONCE(&DynamicObject::StaticInitialize);
boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnStarted;
boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnStopped;
@ -49,16 +46,6 @@ boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnResum
boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnStateChanged;
boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnVarsChanged;
void DynamicObject::StaticInitialize(void)
{
ScriptVariable::Set("DomainPrivRead", DomainPrivRead, true, true);
ScriptVariable::Set("DomainPrivCheckResult", DomainPrivCheckResult, true, true);
ScriptVariable::Set("DomainPrivCommand", DomainPrivCommand, true, true);
ScriptVariable::Set("DomainPrivReadOnly", DomainPrivRead, true, true);
ScriptVariable::Set("DomainPrivReadWrite", DomainPrivRead | DomainPrivCheckResult | DomainPrivCommand, true, true);
}
DynamicObject::DynamicObject(void)
{ }

View File

@ -23,24 +23,16 @@
#include "base/i2-base.h"
#include "base/dynamicobject.th"
#include "base/object.h"
#include "base/serializer.h"
#include "base/dictionary.h"
#include "base/array.h"
#include <boost/signals2.hpp>
#include <map>
#include <set>
namespace icinga
{
class DynamicType;
enum DomainPriv
{
DomainPrivRead = (1<<0),
DomainPrivCheckResult = (1<<1),
DomainPrivCommand = (1<<2)
};
enum ModifiedAttributeType
{
ModAttrNotificationsEnabled = 1,
@ -73,8 +65,6 @@ class I2_BASE_API DynamicObject : public ObjectImpl<DynamicObject>
public:
DECLARE_PTR_TYPEDEFS(DynamicObject);
static void StaticInitialize(void);
static boost::signals2::signal<void (const DynamicObject::Ptr&)> OnStarted;
static boost::signals2::signal<void (const DynamicObject::Ptr&)> OnStopped;
static boost::signals2::signal<void (const DynamicObject::Ptr&)> OnPaused;

View File

@ -21,13 +21,10 @@
#define DYNAMICTYPE_H
#include "base/i2-base.h"
#include "base/registry.h"
#include "base/dynamicobject.h"
#include "base/debug.h"
#include "base/objectlock.h"
#include <map>
#include <set>
#include <boost/function.hpp>
# include <boost/iterator/iterator_facade.hpp>
namespace icinga

View File

@ -18,6 +18,7 @@
******************************************************************************/
#include "base/exception.h"
#include <boost/thread/tss.hpp>
#ifndef _MSC_VER
# include <cxxabi.h>

View File

@ -25,7 +25,6 @@
#include "base/stacktrace.h"
#include "base/context.h"
#include <sstream>
#include <boost/thread/tss.hpp>
#include <boost/exception/errinfo_api_function.hpp>
#include <boost/exception/errinfo_errno.hpp>
#include <boost/exception/errinfo_file_name.hpp>

View File

@ -18,7 +18,6 @@
******************************************************************************/
#include "base/fifo.h"
#include "base/utility.h"
using namespace icinga;

View File

@ -24,9 +24,7 @@
#include "base/utility.h"
#include "base/objectlock.h"
#include "base/context.h"
#include "base/convert.h"
#include "base/scriptvariable.h"
#include <boost/make_shared.hpp>
#include <boost/foreach.hpp>
#include <iostream>

View File

@ -22,7 +22,6 @@
#include "base/i2-base.h"
#include "base/logger.th"
#include "base/dynamicobject.h"
#include "base/logger_fwd.h"
#include <set>

View File

@ -18,6 +18,7 @@
******************************************************************************/
#include "base/netstring.h"
#include "base/qstring.h"
#include "base/debug.h"
#include <sstream>

View File

@ -18,8 +18,6 @@
******************************************************************************/
#include "base/networkstream.h"
#include "base/objectlock.h"
#include <boost/algorithm/string/trim.hpp>
using namespace icinga;

View File

@ -17,7 +17,6 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "i2-base.h"
#include "base/process.h"
#include "base/exception.h"
#include "base/convert.h"
@ -29,10 +28,8 @@
#include "base/utility.h"
#include "base/scriptvariable.h"
#include <boost/foreach.hpp>
#include <boost/bind.hpp>
#include <boost/make_shared.hpp>
#include <boost/thread/thread.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/thread/once.hpp>
#ifndef _WIN32
# include <execvpe.h>

View File

@ -21,13 +21,11 @@
#define PROCESS_H
#include "base/i2-base.h"
#include "base/timer.h"
#include "base/dictionary.h"
#include <boost/function.hpp>
#include <sstream>
#include <deque>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition_variable.hpp>
#include <boost/thread/once.hpp>
#include <vector>
namespace icinga
{

View File

@ -20,10 +20,7 @@
#include "base/qstring.h"
#include "base/value.h"
#include <boost/algorithm/string/trim.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/compare.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/classification.hpp>
#include <ostream>
using namespace icinga;

View File

@ -21,10 +21,10 @@
#define STRING_H
#include "base/i2-base.h"
#include <boost/range/iterator.hpp>
#include <ostream>
#include <string.h>
#include <functional>
#include <string>
#include <istream>
#include <utility>
namespace icinga {
@ -173,12 +173,16 @@ struct string_iless : std::binary_function<String, String, bool>
namespace boost
{
template <typename C> struct range_mutable_iterator;
template<>
struct range_mutable_iterator<icinga::String>
{
typedef icinga::String::Iterator type;
};
template <typename C> struct range_const_iterator;
template<>
struct range_const_iterator<icinga::String>
{

View File

@ -19,8 +19,6 @@
#include "base/scriptfunction.h"
#include "base/scriptvariable.h"
#include "base/registry.h"
#include "base/singleton.h"
using namespace icinga;

View File

@ -21,8 +21,6 @@
#define SCRIPTFUNCTION_H
#include "base/i2-base.h"
#include "base/registry.h"
#include "base/singleton.h"
#include "base/value.h"
#include "base/scriptfunctionwrapper.h"
#include <vector>

View File

@ -25,7 +25,7 @@
#include "base/dictionary.h"
#include "base/serializer.h"
#include "base/logger_fwd.h"
#include "base/application.h"
#include <boost/foreach.hpp>
#include <boost/regex.hpp>
#include <algorithm>
#include <set>

View File

@ -18,7 +18,7 @@
******************************************************************************/
#include "base/scriptvariable.h"
#include "base/logger_fwd.h"
#include "base/singleton.h"
using namespace icinga;

View File

@ -22,7 +22,6 @@
#include "base/i2-base.h"
#include "base/registry.h"
#include "base/singleton.h"
#include "base/value.h"
namespace icinga

View File

@ -22,11 +22,8 @@
#include "base/utility.h"
#include "base/exception.h"
#include <sstream>
#include <boost/bind.hpp>
#include <boost/make_shared.hpp>
#include <boost/exception/errinfo_api_function.hpp>
#include <boost/exception/errinfo_errno.hpp>
#include <boost/exception/errinfo_file_name.hpp>
#ifndef _WIN32
# include <poll.h>

View File

@ -20,8 +20,6 @@
#include "base/stacktrace.h"
#include "base/qstring.h"
#include "base/utility.h"
#include "base/convert.h"
#include "base/application.h"
#include "base/initialize.h"
#ifdef HAVE_BACKTRACE_SYMBOLS

View File

@ -21,9 +21,7 @@
#define STACKTRACE_H
#include "base/i2-base.h"
#include "base/qstring.h"
#include <ostream>
#include <boost/thread/once.hpp>
namespace icinga
{

View File

@ -22,10 +22,8 @@
#include "base/i2-base.h"
#include "base/registry.h"
#include "base/singleton.h"
#include "base/value.h"
#include "base/dictionary.h"
#include <vector>
#include <boost/function.hpp>
namespace icinga

View File

@ -19,7 +19,6 @@
#include "base/stdiostream.h"
#include "base/objectlock.h"
#include <boost/make_shared.hpp>
using namespace icinga;

View File

@ -21,7 +21,7 @@
#define STDIOSTREAM_H
#include "base/i2-base.h"
#include "base/fifo.h"
#include "base/stream.h"
#include <iostream>
namespace icinga {

View File

@ -18,8 +18,7 @@
******************************************************************************/
#include "base/stream.h"
#include "base/objectlock.h"
#include "base/utility.h"
#include "base/qstring.h"
#include <boost/algorithm/string/trim.hpp>
using namespace icinga;

View File

@ -22,13 +22,12 @@
#include "base/i2-base.h"
#include "base/object.h"
#include "base/qstring.h"
#include <boost/exception_ptr.hpp>
#include <boost/signals2.hpp>
namespace icinga
{
class String;
enum ConnectionRole
{
RoleClient,

View File

@ -20,8 +20,6 @@
#include "base/streamlogger.h"
#include "base/utility.h"
#include "base/objectlock.h"
#include <boost/thread/thread.hpp>
#include <fstream>
#include <iostream>
using namespace icinga;

View File

@ -21,7 +21,6 @@
#include "base/exception.h"
#include <boost/exception/errinfo_api_function.hpp>
#include <boost/exception/errinfo_errno.hpp>
#include <boost/exception/errinfo_file_name.hpp>
using namespace icinga;

View File

@ -19,15 +19,11 @@
#include "base/threadpool.h"
#include "base/logger_fwd.h"
#include "base/convert.h"
#include "base/debug.h"
#include "base/utility.h"
#include "base/application.h"
#include "base/exception.h"
#include <sstream>
#include <iostream>
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
using namespace icinga;

View File

@ -21,11 +21,11 @@
#define THREADPOOL_H
#include "base/i2-base.h"
#include <stack>
#include <boost/function.hpp>
#include <boost/thread/thread.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition_variable.hpp>
#include <deque>
namespace icinga
{

View File

@ -18,7 +18,6 @@
******************************************************************************/
#include "base/timer.h"
#include "base/application.h"
#include "base/debug.h"
#include "base/utility.h"
#include <boost/bind.hpp>

View File

@ -18,12 +18,9 @@
******************************************************************************/
#include "base/tlsstream.h"
#include "base/objectlock.h"
#include "base/debug.h"
#include "base/utility.h"
#include "base/exception.h"
#include <boost/bind.hpp>
#include <boost/make_shared.hpp>
using namespace icinga;

View File

@ -22,7 +22,7 @@
#include "base/i2-base.h"
#include "base/socket.h"
#include "base/fifo.h"
#include "base/stream.h"
#include "base/tlsutility.h"
namespace icinga

View File

@ -22,7 +22,7 @@
#include "base/i2-base.h"
#include "base/qstring.h"
#include "base/serializer.h"
#include "base/object.h"
#include "base/initialize.h"
#include <boost/function.hpp>

View File

@ -20,14 +20,13 @@
#ifndef UNIXSOCKET_H
#define UNIXSOCKET_H
#include "base/i2-base.h"
#include "base/socket.h"
#ifndef _WIN32
namespace icinga
{
class UnixSocket : public Socket
class I2_BASE_API UnixSocket : public Socket
{
public:
DECLARE_PTR_TYPEDEFS(UnixSocket);

View File

@ -24,7 +24,6 @@
#include "base/exception.h"
#include <mmatch.h>
#include <boost/lexical_cast.hpp>
#include <boost/function.hpp>
#include <boost/foreach.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/classification.hpp>

View File

@ -17,12 +17,11 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "base/application.h"
#include "base/value.h"
#include "base/array.h"
#include "base/logger_fwd.h"
#include "base/dictionary.h"
#include "base/utility.h"
#include "base/objectlock.h"
#include <cJSON.h>
#include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp>

View File

@ -22,7 +22,6 @@
#include "base/dictionary.h"
#include "base/type.h"
#include <cJSON.h>
#include <boost/lexical_cast.hpp>
using namespace icinga;

View File

@ -19,7 +19,6 @@
#include "base/workqueue.h"
#include "base/utility.h"
#include "base/debug.h"
#include "base/logger_fwd.h"
#include "base/convert.h"
#include <boost/bind.hpp>

View File

@ -25,7 +25,6 @@
#include "config/objectrule.h"
#include "base/array.h"
#include "base/serializer.h"
#include "base/context.h"
#include "base/scriptfunction.h"
#include "base/scriptvariable.h"
#include "base/utility.h"

View File

@ -19,6 +19,8 @@
#include "config/applyrule.h"
#include "base/logger_fwd.h"
#include <boost/foreach.hpp>
#include <set>
using namespace icinga;

View File

@ -23,7 +23,7 @@
#include "config/i2-config.h"
#include "config/aexpression.h"
#include "config/debuginfo.h"
#include "base/dynamictype.h"
#include <boost/function.hpp>
namespace icinga
{

View File

@ -21,6 +21,7 @@
#include "config/configcompiler.h"
#include "config/typerule.h"
#include "config/configcompilercontext.h"
#include "config/aexpression.h"
using namespace icinga;

View File

@ -22,6 +22,7 @@
#include "i2-config.h"
#include "config/configitembuilder.h"
#include "config/configtype.h"
#include "config/configcompiler.h"
#include "config/configcompilercontext.h"
#include "config/configerror.h"
@ -30,6 +31,7 @@
#include "config/aexpression.h"
#include "config/applyrule.h"
#include "config/objectrule.h"
#include "config/aexpression.h"
#include "base/value.h"
#include "base/utility.h"
#include "base/array.h"

View File

@ -23,7 +23,6 @@
#include "base/utility.h"
#include "base/context.h"
#include "base/exception.h"
#include <sstream>
#include <fstream>
#include <boost/foreach.hpp>

View File

@ -18,8 +18,6 @@
******************************************************************************/
#include "config/configcompilercontext.h"
#include "base/utility.h"
#include "base/logger_fwd.h"
#include "base/singleton.h"
#include <boost/foreach.hpp>

View File

@ -21,8 +21,9 @@
#define CONFIGCOMPILERCONTEXT_H
#include "config/i2-config.h"
#include "config/configitem.h"
#include "config/configtype.h"
#include "config/debuginfo.h"
#include <boost/thread/mutex.hpp>
#include <vector>
namespace icinga
{

View File

@ -21,6 +21,7 @@
#include "config/configcompilercontext.h"
#include "config/applyrule.h"
#include "config/objectrule.h"
#include "config/configtype.h"
#include "base/application.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"

View File

@ -18,7 +18,6 @@
******************************************************************************/
#include "config/configitembuilder.h"
#include "config/configcompilercontext.h"
#include "base/dynamictype.h"
#include <sstream>
#include <boost/foreach.hpp>

View File

@ -21,6 +21,7 @@
#include "config/configcompilercontext.h"
#include "base/objectlock.h"
#include "base/convert.h"
#include "base/singleton.h"
#include "base/scriptfunction.h"
#include <boost/foreach.hpp>

View File

@ -21,12 +21,11 @@
#define CONFIGTYPE_H
#include "config/i2-config.h"
#include "config/typerule.h"
#include "config/typerulelist.h"
#include "config/typerule.h"
#include "config/configitem.h"
#include "base/array.h"
#include "base/registry.h"
#include "base/singleton.h"
namespace icinga
{

View File

@ -18,7 +18,8 @@
******************************************************************************/
#include "config/objectrule.h"
#include "base/logger_fwd.h"
#include <boost/foreach.hpp>
#include <set>
using namespace icinga;

View File

@ -19,7 +19,6 @@
#include "config/typerule.h"
#include "config/configitem.h"
#include "config/configcompilercontext.h"
#include "base/convert.h"
#include "base/utility.h"
#include "base/dictionary.h"

View File

@ -25,6 +25,7 @@
#include "base/initialize.h"
#include "base/dynamictype.h"
#include "base/utility.h"
#include "base/logger_fwd.h"
#include "remote/endpoint.h"
#include "icinga/notification.h"
#include "icinga/checkcommand.h"

View File

@ -30,6 +30,7 @@
#include "icinga/compatutility.h"
#include "base/convert.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include <boost/foreach.hpp>
using namespace icinga;

View File

@ -21,12 +21,6 @@
#include "db_ido/dbtype.h"
#include "db_ido/dbvalue.h"
#include "db_ido/dbevents.h"
#include "base/convert.h"
#include "base/objectlock.h"
#include "base/initialize.h"
#include "base/dynamictype.h"
#include "base/utility.h"
#include "remote/endpoint.h"
#include "icinga/notification.h"
#include "icinga/dependency.h"
#include "icinga/checkcommand.h"
@ -34,6 +28,13 @@
#include "icinga/externalcommandprocessor.h"
#include "icinga/compatutility.h"
#include "icinga/icingaapplication.h"
#include "remote/endpoint.h"
#include "base/convert.h"
#include "base/objectlock.h"
#include "base/initialize.h"
#include "base/dynamictype.h"
#include "base/utility.h"
#include "base/logger_fwd.h"
#include <boost/foreach.hpp>
#include <boost/algorithm/string/join.hpp>

View File

@ -21,9 +21,8 @@
#define API_H
#include "icinga/i2-icinga.h"
#include "remote/apiclient.h"
#include "base/value.h"
#include <vector>
#include "base/dictionary.h"
namespace icinga
{

View File

@ -20,13 +20,13 @@
#include "icinga/apievents.h"
#include "icinga/service.h"
#include "remote/apilistener.h"
#include "remote/apiclient.h"
#include "remote/endpoint.h"
#include "remote/messageorigin.h"
#include "remote/zone.h"
#include "remote/apifunction.h"
#include "base/application.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/utility.h"
#include "base/logger_fwd.h"
#include "base/exception.h"
#include "base/initialize.h"
#include <fstream>

View File

@ -22,11 +22,6 @@
#include "icinga/checkable.h"
#include "icinga/host.h"
#include "remote/apiclient.h"
#include "base/stream.h"
#include "base/timer.h"
#include "base/array.h"
#include <boost/signals2.hpp>
namespace icinga
{

View File

@ -17,20 +17,17 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "icinga/service.h"
#include "icinga/checkable.h"
#include "icinga/checkcommand.h"
#include "icinga/icingaapplication.h"
#include "icinga/cib.h"
#include "remote/apilistener.h"
#include "base/dynamictype.h"
#include "remote/messageorigin.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include "base/convert.h"
#include "base/utility.h"
#include "base/exception.h"
#include "base/context.h"
#include <boost/foreach.hpp>
#include <boost/algorithm/string/replace.hpp>
using namespace icinga;

View File

@ -20,9 +20,9 @@
#include "icinga/service.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include "base/timer.h"
#include "base/utility.h"
#include "base/logger_fwd.h"
#include <boost/foreach.hpp>
using namespace icinga;

View File

@ -19,13 +19,7 @@
#include "icinga/service.h"
#include "icinga/dependency.h"
#include "config/configitembuilder.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include "base/timer.h"
#include "base/utility.h"
#include "base/convert.h"
#include <boost/foreach.hpp>
using namespace icinga;

View File

@ -18,7 +18,6 @@
******************************************************************************/
#include "icinga/service.h"
#include "config/configitembuilder.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"

View File

@ -17,9 +17,10 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "icinga/service.h"
#include "icinga/checkable.h"
#include "icinga/eventcommand.h"
#include "icinga/icingaapplication.h"
#include "base/logger_fwd.h"
#include "base/context.h"
using namespace icinga;

View File

@ -17,14 +17,9 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "icinga/service.h"
#include "icinga/checkable.h"
#include "icinga/icingaapplication.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include "base/timer.h"
#include "base/utility.h"
#include "base/convert.h"
#include <boost/foreach.hpp>
using namespace icinga;

View File

@ -17,17 +17,13 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "icinga/service.h"
#include "icinga/checkable.h"
#include "icinga/icingaapplication.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include "base/timer.h"
#include "base/utility.h"
#include "base/exception.h"
#include "base/context.h"
#include "base/convert.h"
#include "config/configitembuilder.h"
#include <boost/foreach.hpp>
using namespace icinga;

View File

@ -17,19 +17,9 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "icinga/service.h"
#include "icinga/servicegroup.h"
#include "icinga/checkcommand.h"
#include "icinga/icingaapplication.h"
#include "icinga/macroprocessor.h"
#include "icinga/pluginutility.h"
#include "icinga/dependency.h"
#include "config/configitembuilder.h"
#include "base/dynamictype.h"
#include "icinga/checkable.h"
#include "base/objectlock.h"
#include "base/convert.h"
#include "base/utility.h"
#include "base/initialize.h"
#include <boost/foreach.hpp>
#include <boost/bind/apply.hpp>

View File

@ -22,16 +22,11 @@
#include "icinga/i2-icinga.h"
#include "icinga/checkable.th"
#include "icinga/macroresolver.h"
#include "icinga/timeperiod.h"
#include "icinga/notification.h"
#include "icinga/comment.h"
#include "icinga/downtime.h"
#include "remote/messageorigin.h"
#include "base/i2-base.h"
#include "base/array.h"
#include <boost/signals2.hpp>
#include <boost/thread/once.hpp>
namespace icinga
{

View File

@ -21,7 +21,7 @@
#define CHECKCOMMAND_H
#include "icinga/checkcommand.th"
#include "icinga/service.h"
#include "icinga/checkable.h"
namespace icinga
{

View File

@ -18,9 +18,6 @@
******************************************************************************/
#include "icinga/checkresult.h"
#include "base/dynamictype.h"
#include "base/initialize.h"
#include "base/scriptvariable.h"
using namespace icinga;

View File

@ -23,18 +23,6 @@ using namespace icinga;
REGISTER_TYPE(Command);
bool Command::ResolveMacro(const String& macro, const CheckResult::Ptr&, String *result) const
{
Dictionary::Ptr vars = GetVars();
if (vars && vars->Contains(macro)) {
*result = vars->Get(macro);
return true;
}
return false;
}
int Command::GetModifiedAttributes(void) const
{
int attrs = 0;

View File

@ -20,13 +20,9 @@
#ifndef COMMAND_H
#define COMMAND_H
#include "icinga/i2-icinga.h"
#include "icinga/command.th"
#include "icinga/macroresolver.h"
#include "base/i2-base.h"
#include "base/array.h"
#include "base/logger_fwd.h"
#include "remote/messageorigin.h"
#include <set>
namespace icinga
{
@ -36,15 +32,13 @@ namespace icinga
*
* @ingroup icinga
*/
class I2_ICINGA_API Command : public ObjectImpl<Command>, public MacroResolver
class I2_ICINGA_API Command : public ObjectImpl<Command>
{
public:
DECLARE_PTR_TYPEDEFS(Command);
//virtual Dictionary::Ptr Execute(const Object::Ptr& context) = 0;
virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, String *result) const;
int GetModifiedAttributes(void) const;
void SetModifiedAttributes(int flags, const MessageOrigin& origin = MessageOrigin());
};

View File

@ -21,16 +21,13 @@
#include "icinga/checkcommand.h"
#include "icinga/eventcommand.h"
#include "icinga/pluginutility.h"
#include "icinga/service.h"
#include "base/utility.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/debug.h"
#include "base/convert.h"
#include <boost/make_shared.hpp>
#include <boost/foreach.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/join.hpp>
using namespace icinga;

View File

@ -21,8 +21,8 @@
#define COMPATUTILITY_H
#include "icinga/i2-icinga.h"
#include "icinga/service.h"
#include "icinga/checkcommand.h"
#include "icinga/host.h"
#include "icinga/command.h"
#include "base/dictionary.h"
#include "base/array.h"
#include "base/dynamicobject.h"

View File

@ -20,9 +20,9 @@
#include "icinga/dependency.h"
#include "icinga/service.h"
#include "config/configitembuilder.h"
#include "config/applyrule.h"
#include "base/initialize.h"
#include "base/dynamictype.h"
#include "base/convert.h"
#include "base/logger_fwd.h"
#include "base/context.h"
#include <boost/foreach.hpp>

View File

@ -20,10 +20,7 @@
#include "icinga/dependency.h"
#include "icinga/service.h"
#include "config/configcompilercontext.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include "base/convert.h"
#include "base/scriptfunction.h"
#include <boost/foreach.hpp>

View File

@ -22,13 +22,13 @@
#include "icinga/i2-icinga.h"
#include "icinga/dependency.th"
#include "config/applyrule.h"
#include "base/array.h"
#include "base/dictionary.h"
namespace icinga
{
class ApplyRule;
/**
* A service dependency..
*

View File

@ -19,7 +19,6 @@
#include "icinga/downtime.h"
#include "base/utility.h"
#include "base/dynamictype.h"
using namespace icinga;

View File

@ -18,7 +18,6 @@
******************************************************************************/
#include "icinga/eventcommand.h"
#include "base/dynamictype.h"
using namespace icinga;

View File

@ -21,7 +21,7 @@
#define EVENTCOMMAND_H
#include "icinga/eventcommand.th"
#include "icinga/service.h"
#include "icinga/checkable.h"
namespace icinga
{

View File

@ -23,8 +23,6 @@
#include "icinga/i2-icinga.h"
#include "icinga/command.h"
#include "base/qstring.h"
#include <boost/thread/mutex.hpp>
#include <boost/thread/once.hpp>
#include <boost/function.hpp>
#include <boost/signals2.hpp>
#include <vector>

View File

@ -20,19 +20,12 @@
#include "icinga/host.h"
#include "icinga/service.h"
#include "icinga/hostgroup.h"
#include "icinga/icingaapplication.h"
#include "icinga/pluginutility.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include "base/timer.h"
#include "base/convert.h"
#include "base/utility.h"
#include "base/scriptfunction.h"
#include "base/debug.h"
#include "base/serializer.h"
#include "config/configitembuilder.h"
#include "config/configcompilercontext.h"
#include <boost/foreach.hpp>
using namespace icinga;

View File

@ -24,15 +24,11 @@
#include "icinga/host.th"
#include "icinga/macroresolver.h"
#include "icinga/checkresult.h"
#include "config/applyrule.h"
#include "base/array.h"
#include "base/dictionary.h"
namespace icinga
{
class Service;
class Dependency;
/**
* An Icinga host.

View File

@ -18,11 +18,10 @@
******************************************************************************/
#include "icinga/hostgroup.h"
#include "config/objectrule.h"
#include "base/dynamictype.h"
#include "base/logger_fwd.h"
#include "base/objectlock.h"
#include "base/utility.h"
#include "base/timer.h"
#include "base/context.h"
#include <boost/foreach.hpp>

View File

@ -23,11 +23,12 @@
#include "icinga/i2-icinga.h"
#include "icinga/hostgroup.th"
#include "icinga/host.h"
#include "config/objectrule.h"
namespace icinga
{
class ObjectRule;
/**
* An Icinga host group.
*

View File

@ -18,22 +18,11 @@
******************************************************************************/
#include "icinga/icingastatuswriter.h"
#include "icinga/icingaapplication.h"
#include "icinga/cib.h"
#include "icinga/hostgroup.h"
#include "icinga/servicegroup.h"
#include "icinga/checkcommand.h"
#include "icinga/eventcommand.h"
#include "icinga/timeperiod.h"
#include "icinga/notificationcommand.h"
#include "icinga/compatutility.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/convert.h"
#include "base/logger_fwd.h"
#include "base/exception.h"
#include "base/application.h"
#include "base/context.h"
#include "base/statsfunction.h"
#include <boost/foreach.hpp>
#include <boost/algorithm/string/replace.hpp>

View File

@ -21,15 +21,7 @@
#define ICINGASTATUSWRITER_H
#include "icinga/icingastatuswriter.th"
#include "icinga/host.h"
#include "icinga/service.h"
#include "icinga/command.h"
#include "icinga/compatutility.h"
#include "base/objectlock.h"
#include "base/timer.h"
#include "base/utility.h"
#include <boost/thread/thread.hpp>
#include <iostream>
namespace icinga
{

View File

@ -21,7 +21,7 @@
#define LEGACYTIMEPERIOD_H
#include "icinga/i2-icinga.h"
#include "icinga/service.h"
#include "icinga/timeperiod.h"
#include "base/dictionary.h"
namespace icinga

View File

@ -19,7 +19,6 @@
#include "icinga/macroprocessor.h"
#include "icinga/macroresolver.h"
#include "base/utility.h"
#include "base/array.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"

View File

@ -21,11 +21,10 @@
#define MACROPROCESSOR_H
#include "icinga/i2-icinga.h"
#include "icinga/macroresolver.h"
#include "base/dictionary.h"
#include "base/array.h"
#include "icinga/checkable.h"
#include "base/value.h"
#include <boost/function.hpp>
#include <map>
#include <vector>
namespace icinga
{

View File

@ -17,11 +17,12 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "icinga/notification.h"
#include "icinga/service.h"
#include "config/configitembuilder.h"
#include "config/applyrule.h"
#include "base/initialize.h"
#include "base/dynamictype.h"
#include "base/convert.h"
#include "base/logger_fwd.h"
#include "base/context.h"
#include <boost/foreach.hpp>

View File

@ -19,10 +19,8 @@
#include "icinga/notification.h"
#include "icinga/notificationcommand.h"
#include "icinga/macroprocessor.h"
#include "icinga/service.h"
#include "config/configcompilercontext.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include "base/utility.h"

View File

@ -25,8 +25,8 @@
#include "icinga/user.h"
#include "icinga/usergroup.h"
#include "icinga/timeperiod.h"
#include "icinga/checkresult.h"
#include "remote/messageorigin.h"
#include "config/applyrule.h"
#include "base/array.h"
namespace icinga
@ -66,6 +66,7 @@ enum NotificationType
class NotificationCommand;
class Checkable;
class ApplyRule;
/**
* An Icinga notification specification.

View File

@ -18,7 +18,6 @@
******************************************************************************/
#include "icinga/notificationcommand.h"
#include "base/dynamictype.h"
using namespace icinga;

Some files were not shown because too many files have changed in this diff Show More