From b18f57a7454159754a4a5032bdf06c446a4d4cb2 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 19 Oct 2014 14:21:12 +0200 Subject: [PATCH] Remove logger_fwd.hpp --- lib/base/application.hpp | 2 +- lib/base/clicommand.cpp | 2 +- lib/base/dynamicobject.cpp | 2 +- lib/base/logger.hpp | 15 ++++++- lib/base/logger_fwd.hpp | 48 ---------------------- lib/base/process.cpp | 2 +- lib/base/scriptutils.cpp | 2 +- lib/base/socket.cpp | 2 +- lib/base/tcpsocket.cpp | 2 +- lib/base/threadpool.cpp | 2 +- lib/base/tlsstream.cpp | 2 +- lib/base/tlsutility.cpp | 2 +- lib/base/utility.cpp | 2 +- lib/base/workqueue.cpp | 2 +- lib/checker/checkercomponent.cpp | 2 +- lib/cli/agentaddcommand.cpp | 2 +- lib/cli/agentblackandwhitelistcommand.cpp | 2 +- lib/cli/agentlistcommand.cpp | 2 +- lib/cli/agentremovecommand.cpp | 2 +- lib/cli/agentsetcommand.cpp | 2 +- lib/cli/agentsetupcommand.cpp | 2 +- lib/cli/agentupdateconfigcommand.cpp | 2 +- lib/cli/agentwizardcommand.cpp | 2 +- lib/cli/daemoncommand.cpp | 2 +- lib/cli/featuredisablecommand.cpp | 2 +- lib/cli/featureenablecommand.cpp | 2 +- lib/cli/featurelistcommand.cpp | 2 +- lib/cli/featureutility.cpp | 2 +- lib/cli/objectlistcommand.cpp | 2 +- lib/cli/pkinewcacommand.cpp | 2 +- lib/cli/pkinewcertcommand.cpp | 2 +- lib/cli/pkirequestcommand.cpp | 2 +- lib/cli/pkisigncsrcommand.cpp | 2 +- lib/cli/pkiticketcommand.cpp | 2 +- lib/cli/repositoryobjectcommand.cpp | 2 +- lib/compat/checkresultreader.cpp | 2 +- lib/compat/compatlogger.cpp | 2 +- lib/compat/externalcommandlistener.cpp | 2 +- lib/compat/statusdatawriter.cpp | 2 +- lib/config/applyrule.cpp | 2 +- lib/config/configcompiler.cpp | 2 +- lib/config/configitem.cpp | 2 +- lib/config/expression.cpp | 2 +- lib/db_ido/dbconnection.cpp | 2 +- lib/db_ido/dbevents.cpp | 2 +- lib/db_ido/dbobject.cpp | 2 +- lib/db_ido/endpointdbobject.cpp | 2 +- lib/db_ido/hostdbobject.cpp | 2 +- lib/db_ido/servicedbobject.cpp | 2 +- lib/db_ido/userdbobject.cpp | 2 +- lib/db_ido_mysql/idomysqlconnection.cpp | 2 +- lib/db_ido_pgsql/idopgsqlconnection.cpp | 2 +- lib/demo/demo.cpp | 2 +- lib/hello/hello.cpp | 2 +- lib/icinga/api.cpp | 2 +- lib/icinga/checkable-check.cpp | 2 +- lib/icinga/checkable-comment.cpp | 2 +- lib/icinga/checkable-dependency.cpp | 2 +- lib/icinga/checkable-downtime.cpp | 2 +- lib/icinga/checkable-event.cpp | 2 +- lib/icinga/checkable-notification.cpp | 2 +- lib/icinga/customvarobject.cpp | 2 +- lib/icinga/dependency-apply.cpp | 2 +- lib/icinga/dependency.cpp | 2 +- lib/icinga/externalcommandprocessor.cpp | 2 +- lib/icinga/hostgroup.cpp | 2 +- lib/icinga/icingaapplication.cpp | 2 +- lib/icinga/icingastatuswriter.cpp | 2 +- lib/icinga/legacytimeperiod.cpp | 2 +- lib/icinga/macroprocessor.cpp | 2 +- lib/icinga/notification-apply.cpp | 2 +- lib/icinga/notification.cpp | 2 +- lib/icinga/pluginutility.cpp | 2 +- lib/icinga/scheduleddowntime-apply.cpp | 2 +- lib/icinga/scheduleddowntime.cpp | 2 +- lib/icinga/service-apply.cpp | 2 +- lib/icinga/servicegroup.cpp | 2 +- lib/icinga/timeperiod.cpp | 2 +- lib/icinga/usergroup.cpp | 2 +- lib/livestatus/attributefilter.cpp | 2 +- lib/livestatus/livestatuslistener.cpp | 2 +- lib/livestatus/livestatuslogutility.cpp | 2 +- lib/livestatus/livestatusquery.cpp | 2 +- lib/livestatus/logtable.cpp | 2 +- lib/livestatus/statehisttable.cpp | 2 +- lib/methods/clrchecktask.cpp | 2 +- lib/methods/nullchecktask.cpp | 2 +- lib/methods/nulleventtask.cpp | 2 +- lib/methods/pluginchecktask.cpp | 2 +- lib/methods/plugineventtask.cpp | 2 +- lib/methods/pluginnotificationtask.cpp | 2 +- lib/methods/randomchecktask.cpp | 2 +- lib/notification/notificationcomponent.cpp | 2 +- lib/perfdata/graphitewriter.cpp | 2 +- lib/perfdata/perfdatawriter.cpp | 2 +- lib/remote/apiclient.cpp | 2 +- lib/remote/apilistener-sync.cpp | 2 +- lib/remote/apilistener.cpp | 2 +- 98 files changed, 110 insertions(+), 145 deletions(-) delete mode 100644 lib/base/logger_fwd.hpp diff --git a/lib/base/application.hpp b/lib/base/application.hpp index 4b66f257c..eb3713846 100644 --- a/lib/base/application.hpp +++ b/lib/base/application.hpp @@ -24,7 +24,7 @@ #include "base/application.thpp" #include "base/threadpool.hpp" #include "base/utility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" namespace icinga { diff --git a/lib/base/clicommand.cpp b/lib/base/clicommand.cpp index d4c76988f..b23ae8287 100644 --- a/lib/base/clicommand.cpp +++ b/lib/base/clicommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "base/clicommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/type.hpp" #include "base/serializer.hpp" #include diff --git a/lib/base/dynamicobject.cpp b/lib/base/dynamicobject.cpp index 0d6ac6629..7a41cdfde 100644 --- a/lib/base/dynamicobject.cpp +++ b/lib/base/dynamicobject.cpp @@ -24,7 +24,7 @@ #include "base/stdiostream.hpp" #include "base/debug.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include "base/scriptfunction.hpp" #include "base/initialize.hpp" diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp index 56d318279..d8b0bc162 100644 --- a/lib/base/logger.hpp +++ b/lib/base/logger.hpp @@ -22,12 +22,25 @@ #include "base/i2-base.hpp" #include "base/logger.thpp" -#include "base/logger_fwd.hpp" #include namespace icinga { +/** + * Log severity. + * + * @ingroup base + */ +enum LogSeverity +{ + LogDebug, + LogNotice, + LogInformation, + LogWarning, + LogCritical +}; + /** * A log entry. * diff --git a/lib/base/logger_fwd.hpp b/lib/base/logger_fwd.hpp deleted file mode 100644 index 3661e1f79..000000000 --- a/lib/base/logger_fwd.hpp +++ /dev/null @@ -1,48 +0,0 @@ -/****************************************************************************** - * Icinga 2 * - * Copyright (C) 2012-2014 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 LOGGER_FWD_H -#define LOGGER_FWD_H - -#include "base/i2-base.hpp" -#include "base/qstring.hpp" - -namespace icinga -{ - -/** - * Log severity. - * - * @ingroup base - */ -enum LogSeverity -{ - LogDebug, - LogNotice, - LogInformation, - LogWarning, - LogCritical -}; - -void I2_BASE_API Log(LogSeverity severity, const String& facility, - const String& message); - -} - -#endif /* LOGGER_FWD_H */ diff --git a/lib/base/process.cpp b/lib/base/process.cpp index 9ad9197ae..39630e824 100644 --- a/lib/base/process.cpp +++ b/lib/base/process.cpp @@ -24,7 +24,7 @@ #include "base/objectlock.hpp" #include "base/utility.hpp" #include "base/initialize.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/utility.hpp" #include "base/scriptvariable.hpp" #include diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp index 8aacbc00d..c24e3ba75 100644 --- a/lib/base/scriptutils.cpp +++ b/lib/base/scriptutils.cpp @@ -24,7 +24,7 @@ #include "base/array.hpp" #include "base/dictionary.hpp" #include "base/serializer.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include #include #include diff --git a/lib/base/socket.cpp b/lib/base/socket.cpp index 7d79980a9..562ddd9bf 100644 --- a/lib/base/socket.cpp +++ b/lib/base/socket.cpp @@ -21,7 +21,7 @@ #include "base/objectlock.hpp" #include "base/utility.hpp" #include "base/exception.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include #include #include diff --git a/lib/base/tcpsocket.cpp b/lib/base/tcpsocket.cpp index 46fd1df28..5bdcd991b 100644 --- a/lib/base/tcpsocket.cpp +++ b/lib/base/tcpsocket.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "base/tcpsocket.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/utility.hpp" #include "base/exception.hpp" #include diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp index 5197bf7bc..77fb7d35c 100644 --- a/lib/base/threadpool.cpp +++ b/lib/base/threadpool.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "base/threadpool.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/debug.hpp" #include "base/utility.hpp" #include "base/exception.hpp" diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp index a2d812171..7d96fba8f 100644 --- a/lib/base/tlsstream.cpp +++ b/lib/base/tlsstream.cpp @@ -20,7 +20,7 @@ #include "base/tlsstream.hpp" #include "base/utility.hpp" #include "base/exception.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include #include diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp index 566d43112..963de5536 100644 --- a/lib/base/tlsutility.cpp +++ b/lib/base/tlsutility.cpp @@ -19,7 +19,7 @@ #include "base/tlsutility.hpp" #include "base/convert.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/context.hpp" #include "base/application.hpp" diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp index eeadf1178..b6b86ad37 100644 --- a/lib/base/utility.cpp +++ b/lib/base/utility.cpp @@ -20,7 +20,7 @@ #include "base/utility.hpp" #include "base/convert.hpp" #include "base/application.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include "base/socket.hpp" #include "base/utility.hpp" diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp index 1a1a87ca5..17f05811e 100644 --- a/lib/base/workqueue.cpp +++ b/lib/base/workqueue.cpp @@ -19,7 +19,7 @@ #include "base/workqueue.hpp" #include "base/utility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/convert.hpp" #include #include diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp index 83c2368a8..708d24228 100644 --- a/lib/checker/checkercomponent.cpp +++ b/lib/checker/checkercomponent.cpp @@ -25,7 +25,7 @@ #include "base/dynamictype.hpp" #include "base/objectlock.hpp" #include "base/utility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include "base/convert.hpp" #include "base/statsfunction.hpp" diff --git a/lib/cli/agentaddcommand.cpp b/lib/cli/agentaddcommand.cpp index 992e4d6ec..ab7e06d8a 100644 --- a/lib/cli/agentaddcommand.cpp +++ b/lib/cli/agentaddcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/agentaddcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include diff --git a/lib/cli/agentblackandwhitelistcommand.cpp b/lib/cli/agentblackandwhitelistcommand.cpp index 02fbc1fc2..6406b011d 100644 --- a/lib/cli/agentblackandwhitelistcommand.cpp +++ b/lib/cli/agentblackandwhitelistcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/agentblackandwhitelistcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include "base/tlsutility.hpp" diff --git a/lib/cli/agentlistcommand.cpp b/lib/cli/agentlistcommand.cpp index 8163f9edb..132472aa4 100644 --- a/lib/cli/agentlistcommand.cpp +++ b/lib/cli/agentlistcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/agentlistcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include diff --git a/lib/cli/agentremovecommand.cpp b/lib/cli/agentremovecommand.cpp index aa082738b..194ac1d28 100644 --- a/lib/cli/agentremovecommand.cpp +++ b/lib/cli/agentremovecommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/agentremovecommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include diff --git a/lib/cli/agentsetcommand.cpp b/lib/cli/agentsetcommand.cpp index 8f658bcc5..b6421ffaa 100644 --- a/lib/cli/agentsetcommand.cpp +++ b/lib/cli/agentsetcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/agentsetcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include diff --git a/lib/cli/agentsetupcommand.cpp b/lib/cli/agentsetupcommand.cpp index 11c06acc9..d86f7a02a 100644 --- a/lib/cli/agentsetupcommand.cpp +++ b/lib/cli/agentsetupcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/agentsetupcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include diff --git a/lib/cli/agentupdateconfigcommand.cpp b/lib/cli/agentupdateconfigcommand.cpp index 8a80d7b5a..df2828cf9 100644 --- a/lib/cli/agentupdateconfigcommand.cpp +++ b/lib/cli/agentupdateconfigcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/agentupdateconfigcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include diff --git a/lib/cli/agentwizardcommand.cpp b/lib/cli/agentwizardcommand.cpp index 8ec686f55..3e42ddcc1 100644 --- a/lib/cli/agentwizardcommand.cpp +++ b/lib/cli/agentwizardcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/agentwizardcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp index 735566283..09841a860 100644 --- a/lib/cli/daemoncommand.cpp +++ b/lib/cli/daemoncommand.cpp @@ -21,7 +21,7 @@ #include "config/configcompilercontext.hpp" #include "config/configcompiler.hpp" #include "config/configitembuilder.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include "base/logger.hpp" diff --git a/lib/cli/featuredisablecommand.cpp b/lib/cli/featuredisablecommand.cpp index 38d341752..ceb99bbd7 100644 --- a/lib/cli/featuredisablecommand.cpp +++ b/lib/cli/featuredisablecommand.cpp @@ -19,7 +19,7 @@ #include "cli/featuredisablecommand.hpp" #include "cli/featureutility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include "base/convert.hpp" diff --git a/lib/cli/featureenablecommand.cpp b/lib/cli/featureenablecommand.cpp index eb518f96e..fdaa3f54f 100644 --- a/lib/cli/featureenablecommand.cpp +++ b/lib/cli/featureenablecommand.cpp @@ -19,7 +19,7 @@ #include "cli/featureenablecommand.hpp" #include "cli/featureutility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include "base/convert.hpp" diff --git a/lib/cli/featurelistcommand.cpp b/lib/cli/featurelistcommand.cpp index c5e09040d..58e651eab 100644 --- a/lib/cli/featurelistcommand.cpp +++ b/lib/cli/featurelistcommand.cpp @@ -19,7 +19,7 @@ #include "cli/featurelistcommand.hpp" #include "cli/featureutility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/convert.hpp" #include "base/console.hpp" diff --git a/lib/cli/featureutility.cpp b/lib/cli/featureutility.cpp index 91ab66d88..dcb689b4c 100644 --- a/lib/cli/featureutility.cpp +++ b/lib/cli/featureutility.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/featureutility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include diff --git a/lib/cli/objectlistcommand.cpp b/lib/cli/objectlistcommand.cpp index db8e2b3b1..8c122e8e8 100644 --- a/lib/cli/objectlistcommand.cpp +++ b/lib/cli/objectlistcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/objectlistcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include "base/convert.hpp" diff --git a/lib/cli/pkinewcacommand.cpp b/lib/cli/pkinewcacommand.cpp index 373ab7d49..c7a106046 100644 --- a/lib/cli/pkinewcacommand.cpp +++ b/lib/cli/pkinewcacommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/pkinewcacommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include "base/tlsutility.hpp" diff --git a/lib/cli/pkinewcertcommand.cpp b/lib/cli/pkinewcertcommand.cpp index fac38fd62..530b27f10 100644 --- a/lib/cli/pkinewcertcommand.cpp +++ b/lib/cli/pkinewcertcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/pkinewcertcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/tlsutility.hpp" diff --git a/lib/cli/pkirequestcommand.cpp b/lib/cli/pkirequestcommand.cpp index f238197f8..2ed8baeb1 100644 --- a/lib/cli/pkirequestcommand.cpp +++ b/lib/cli/pkirequestcommand.cpp @@ -19,7 +19,7 @@ #include "cli/pkirequestcommand.hpp" #include "remote/jsonrpc.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/tlsutility.hpp" #include "base/tlsstream.hpp" diff --git a/lib/cli/pkisigncsrcommand.cpp b/lib/cli/pkisigncsrcommand.cpp index c69622ff1..5b7ce8488 100644 --- a/lib/cli/pkisigncsrcommand.cpp +++ b/lib/cli/pkisigncsrcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/pkisigncsrcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/tlsutility.hpp" #include "base/application.hpp" diff --git a/lib/cli/pkiticketcommand.cpp b/lib/cli/pkiticketcommand.cpp index 2dc2932e1..7510ab287 100644 --- a/lib/cli/pkiticketcommand.cpp +++ b/lib/cli/pkiticketcommand.cpp @@ -19,7 +19,7 @@ #include "cli/pkiticketcommand.hpp" #include "remote/jsonrpc.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/tlsutility.hpp" #include "base/tlsstream.hpp" diff --git a/lib/cli/repositoryobjectcommand.cpp b/lib/cli/repositoryobjectcommand.cpp index d0e840722..8c4eeeef8 100644 --- a/lib/cli/repositoryobjectcommand.cpp +++ b/lib/cli/repositoryobjectcommand.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "cli/repositoryobjectcommand.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/clicommand.hpp" #include "base/application.hpp" #include "base/tlsutility.hpp" diff --git a/lib/compat/checkresultreader.cpp b/lib/compat/checkresultreader.cpp index 37920d36d..d925300ca 100644 --- a/lib/compat/checkresultreader.cpp +++ b/lib/compat/checkresultreader.cpp @@ -23,7 +23,7 @@ #include "icinga/icingaapplication.hpp" #include "base/dynamictype.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/convert.hpp" #include "base/application.hpp" #include "base/utility.hpp" diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp index e4ca628e6..108f5ef17 100644 --- a/lib/compat/compatlogger.cpp +++ b/lib/compat/compatlogger.cpp @@ -28,7 +28,7 @@ #include "config/configcompilercontext.hpp" #include "base/dynamictype.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include "base/convert.hpp" #include "base/application.hpp" diff --git a/lib/compat/externalcommandlistener.cpp b/lib/compat/externalcommandlistener.cpp index dca4ea3f5..2a3dd68cf 100644 --- a/lib/compat/externalcommandlistener.cpp +++ b/lib/compat/externalcommandlistener.cpp @@ -20,7 +20,7 @@ #include "compat/externalcommandlistener.hpp" #include "icinga/externalcommandprocessor.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include "base/application.hpp" #include "base/statsfunction.hpp" diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp index e4c3549d4..5fb97407e 100644 --- a/lib/compat/statusdatawriter.cpp +++ b/lib/compat/statusdatawriter.cpp @@ -31,7 +31,7 @@ #include "base/dynamictype.hpp" #include "base/objectlock.hpp" #include "base/convert.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include "base/application.hpp" #include "base/context.hpp" diff --git a/lib/config/applyrule.cpp b/lib/config/applyrule.cpp index b21995af8..737b47d7c 100644 --- a/lib/config/applyrule.cpp +++ b/lib/config/applyrule.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "config/applyrule.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include #include diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp index 76e4d8312..c58b876bd 100644 --- a/lib/config/configcompiler.cpp +++ b/lib/config/configcompiler.cpp @@ -19,7 +19,7 @@ #include "config/configcompiler.hpp" #include "config/configitem.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/utility.hpp" #include "base/context.hpp" #include "base/exception.hpp" diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp index 44f941cdc..eb3c2af78 100644 --- a/lib/config/configitem.cpp +++ b/lib/config/configitem.cpp @@ -26,7 +26,7 @@ #include "base/dynamictype.hpp" #include "base/objectlock.hpp" #include "base/convert.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/debug.hpp" #include "base/workqueue.hpp" #include "base/exception.hpp" diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp index 78f354a54..090476e0f 100644 --- a/lib/config/expression.cpp +++ b/lib/config/expression.cpp @@ -29,7 +29,7 @@ #include "base/utility.hpp" #include "base/objectlock.hpp" #include "base/object.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/configerror.hpp" #include #include diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp index cc6c3f70c..f5c13bc43 100644 --- a/lib/db_ido/dbconnection.cpp +++ b/lib/db_ido/dbconnection.cpp @@ -28,7 +28,7 @@ #include "base/objectlock.hpp" #include "base/utility.hpp" #include "base/initialize.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/scriptfunction.hpp" #include diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp index 038b9657a..a803ed2bc 100644 --- a/lib/db_ido/dbevents.cpp +++ b/lib/db_ido/dbevents.cpp @@ -25,7 +25,7 @@ #include "base/initialize.hpp" #include "base/dynamictype.hpp" #include "base/utility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "remote/endpoint.hpp" #include "icinga/notification.hpp" #include "icinga/checkcommand.hpp" diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp index 48c98c1b3..f9c5a335b 100644 --- a/lib/db_ido/dbobject.cpp +++ b/lib/db_ido/dbobject.cpp @@ -30,7 +30,7 @@ #include "base/objectlock.hpp" #include "base/utility.hpp" #include "base/initialize.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include using namespace icinga; diff --git a/lib/db_ido/endpointdbobject.cpp b/lib/db_ido/endpointdbobject.cpp index 49fbed5c2..90c477550 100644 --- a/lib/db_ido/endpointdbobject.cpp +++ b/lib/db_ido/endpointdbobject.cpp @@ -26,7 +26,7 @@ #include "base/dynamictype.hpp" #include "base/utility.hpp" #include "base/convert.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include using namespace icinga; diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp index ff43697c8..b3bd6bdd8 100644 --- a/lib/db_ido/hostdbobject.cpp +++ b/lib/db_ido/hostdbobject.cpp @@ -30,7 +30,7 @@ #include "icinga/compatutility.hpp" #include "base/convert.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include using namespace icinga; diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp index 6a8cc1c36..f8db77b10 100644 --- a/lib/db_ido/servicedbobject.cpp +++ b/lib/db_ido/servicedbobject.cpp @@ -34,7 +34,7 @@ #include "base/initialize.hpp" #include "base/dynamictype.hpp" #include "base/utility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include #include diff --git a/lib/db_ido/userdbobject.cpp b/lib/db_ido/userdbobject.cpp index 1a37bae61..a5481e142 100644 --- a/lib/db_ido/userdbobject.cpp +++ b/lib/db_ido/userdbobject.cpp @@ -24,7 +24,7 @@ #include "icinga/notification.hpp" #include "base/convert.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include using namespace icinga; diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index df75ef44a..d80efd633 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -21,7 +21,7 @@ #include "db_ido/dbtype.hpp" #include "db_ido/dbvalue.hpp" #include "db_ido_mysql/idomysqlconnection.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/objectlock.hpp" #include "base/convert.hpp" #include "base/utility.hpp" diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp index d77f84c43..28eb34470 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@ -21,7 +21,7 @@ #include "db_ido/dbvalue.hpp" #include "db_ido_pgsql/idopgsqlconnection.hpp" #include "icinga/perfdatavalue.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/objectlock.hpp" #include "base/convert.hpp" #include "base/utility.hpp" diff --git a/lib/demo/demo.cpp b/lib/demo/demo.cpp index 250302c57..4d163a65b 100644 --- a/lib/demo/demo.cpp +++ b/lib/demo/demo.cpp @@ -21,7 +21,7 @@ #include "remote/apilistener.hpp" #include "remote/apifunction.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" using namespace icinga; diff --git a/lib/hello/hello.cpp b/lib/hello/hello.cpp index a75becd4b..bd9d0597f 100644 --- a/lib/hello/hello.cpp +++ b/lib/hello/hello.cpp @@ -19,7 +19,7 @@ #include "hello/hello.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" using namespace icinga; diff --git a/lib/icinga/api.cpp b/lib/icinga/api.cpp index 7c8c10d4c..9e6afed7e 100644 --- a/lib/icinga/api.cpp +++ b/lib/icinga/api.cpp @@ -19,7 +19,7 @@ #include "icinga/api.hpp" #include "remote/apifunction.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" using namespace icinga; diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp index 50150b757..af37cead8 100644 --- a/lib/icinga/checkable-check.cpp +++ b/lib/icinga/checkable-check.cpp @@ -25,7 +25,7 @@ #include "icinga/cib.hpp" #include "remote/messageorigin.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/convert.hpp" #include "base/utility.hpp" #include "base/context.hpp" diff --git a/lib/icinga/checkable-comment.cpp b/lib/icinga/checkable-comment.cpp index 736398c5f..ae6497c79 100644 --- a/lib/icinga/checkable-comment.cpp +++ b/lib/icinga/checkable-comment.cpp @@ -22,7 +22,7 @@ #include "base/objectlock.hpp" #include "base/timer.hpp" #include "base/utility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include using namespace icinga; diff --git a/lib/icinga/checkable-dependency.cpp b/lib/icinga/checkable-dependency.cpp index 4a6828b85..d6e87133e 100644 --- a/lib/icinga/checkable-dependency.cpp +++ b/lib/icinga/checkable-dependency.cpp @@ -19,7 +19,7 @@ #include "icinga/service.hpp" #include "icinga/dependency.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include using namespace icinga; diff --git a/lib/icinga/checkable-downtime.cpp b/lib/icinga/checkable-downtime.cpp index d793cf847..20207f02e 100644 --- a/lib/icinga/checkable-downtime.cpp +++ b/lib/icinga/checkable-downtime.cpp @@ -20,7 +20,7 @@ #include "icinga/service.hpp" #include "base/dynamictype.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/timer.hpp" #include "base/utility.hpp" #include "base/convert.hpp" diff --git a/lib/icinga/checkable-event.cpp b/lib/icinga/checkable-event.cpp index a126b282f..afc9235e2 100644 --- a/lib/icinga/checkable-event.cpp +++ b/lib/icinga/checkable-event.cpp @@ -20,7 +20,7 @@ #include "icinga/checkable.hpp" #include "icinga/eventcommand.hpp" #include "icinga/icingaapplication.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/context.hpp" using namespace icinga; diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp index 28b92a72d..01ec04c91 100644 --- a/lib/icinga/checkable-notification.cpp +++ b/lib/icinga/checkable-notification.cpp @@ -20,7 +20,7 @@ #include "icinga/checkable.hpp" #include "icinga/icingaapplication.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include "base/context.hpp" #include "base/convert.hpp" diff --git a/lib/icinga/customvarobject.cpp b/lib/icinga/customvarobject.cpp index 75ad2ed66..095055220 100644 --- a/lib/icinga/customvarobject.cpp +++ b/lib/icinga/customvarobject.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "icinga/customvarobject.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" using namespace icinga; diff --git a/lib/icinga/dependency-apply.cpp b/lib/icinga/dependency-apply.cpp index c546de0cc..9133bc5c4 100644 --- a/lib/icinga/dependency-apply.cpp +++ b/lib/icinga/dependency-apply.cpp @@ -24,7 +24,7 @@ #include "config/configcompilercontext.hpp" #include "base/initialize.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/context.hpp" #include "base/workqueue.hpp" #include "base/configerror.hpp" diff --git a/lib/icinga/dependency.cpp b/lib/icinga/dependency.cpp index 3bfae8874..3b3826177 100644 --- a/lib/icinga/dependency.cpp +++ b/lib/icinga/dependency.cpp @@ -20,7 +20,7 @@ #include "icinga/dependency.hpp" #include "icinga/service.hpp" #include "config/configcompilercontext.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/scriptfunction.hpp" #include diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp index 2a7b632d9..d938130fe 100644 --- a/lib/icinga/externalcommandprocessor.cpp +++ b/lib/icinga/externalcommandprocessor.cpp @@ -30,7 +30,7 @@ #include "icinga/notificationcommand.hpp" #include "remote/apifunction.hpp" #include "base/convert.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/objectlock.hpp" #include "base/application.hpp" #include "base/utility.hpp" diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp index dc4d95ccb..8c2ccae1f 100644 --- a/lib/icinga/hostgroup.cpp +++ b/lib/icinga/hostgroup.cpp @@ -20,7 +20,7 @@ #include "icinga/hostgroup.hpp" #include "config/objectrule.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/objectlock.hpp" #include "base/context.hpp" #include "base/workqueue.hpp" diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp index c0393b319..6ecb1e146 100644 --- a/lib/icinga/icingaapplication.cpp +++ b/lib/icinga/icingaapplication.cpp @@ -20,7 +20,7 @@ #include "icinga/icingaapplication.hpp" #include "icinga/cib.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/objectlock.hpp" #include "base/convert.hpp" #include "base/debug.hpp" diff --git a/lib/icinga/icingastatuswriter.cpp b/lib/icinga/icingastatuswriter.cpp index a0c52f5d1..ac4948131 100644 --- a/lib/icinga/icingastatuswriter.cpp +++ b/lib/icinga/icingastatuswriter.cpp @@ -20,7 +20,7 @@ #include "icinga/icingastatuswriter.hpp" #include "icinga/cib.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include "base/application.hpp" #include "base/statsfunction.hpp" diff --git a/lib/icinga/legacytimeperiod.cpp b/lib/icinga/legacytimeperiod.cpp index a1c70a655..fc87ae660 100644 --- a/lib/icinga/legacytimeperiod.cpp +++ b/lib/icinga/legacytimeperiod.cpp @@ -22,7 +22,7 @@ #include "base/convert.hpp" #include "base/exception.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/debug.hpp" #include "base/utility.hpp" #include diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp index cd2d84562..09c04ba2b 100644 --- a/lib/icinga/macroprocessor.cpp +++ b/lib/icinga/macroprocessor.cpp @@ -22,7 +22,7 @@ #include "icinga/customvarobject.hpp" #include "base/array.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/context.hpp" #include "base/dynamicobject.hpp" #include diff --git a/lib/icinga/notification-apply.cpp b/lib/icinga/notification-apply.cpp index 961abbc5b..3c0b64ed6 100644 --- a/lib/icinga/notification-apply.cpp +++ b/lib/icinga/notification-apply.cpp @@ -24,7 +24,7 @@ #include "config/configcompilercontext.hpp" #include "base/initialize.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/context.hpp" #include "base/workqueue.hpp" #include "base/configerror.hpp" diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp index 361ccaa6b..1031c2884 100644 --- a/lib/icinga/notification.cpp +++ b/lib/icinga/notification.cpp @@ -22,7 +22,7 @@ #include "icinga/service.hpp" #include "config/configcompilercontext.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/utility.hpp" #include "base/convert.hpp" #include "base/exception.hpp" diff --git a/lib/icinga/pluginutility.cpp b/lib/icinga/pluginutility.cpp index 9f8810ae7..4ad707db8 100644 --- a/lib/icinga/pluginutility.cpp +++ b/lib/icinga/pluginutility.cpp @@ -20,7 +20,7 @@ #include "icinga/pluginutility.hpp" #include "icinga/macroprocessor.hpp" #include "icinga/perfdatavalue.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/utility.hpp" #include "base/convert.hpp" #include "base/process.hpp" diff --git a/lib/icinga/scheduleddowntime-apply.cpp b/lib/icinga/scheduleddowntime-apply.cpp index d6a8edbfb..172153376 100644 --- a/lib/icinga/scheduleddowntime-apply.cpp +++ b/lib/icinga/scheduleddowntime-apply.cpp @@ -24,7 +24,7 @@ #include "config/configcompilercontext.hpp" #include "base/initialize.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/context.hpp" #include "base/configerror.hpp" #include diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp index 43f4113ae..fa7722075 100644 --- a/lib/icinga/scheduleddowntime.cpp +++ b/lib/icinga/scheduleddowntime.cpp @@ -27,7 +27,7 @@ #include "base/utility.hpp" #include "base/objectlock.hpp" #include "base/convert.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include diff --git a/lib/icinga/service-apply.cpp b/lib/icinga/service-apply.cpp index 86b72e9a3..9ba215dbb 100644 --- a/lib/icinga/service-apply.cpp +++ b/lib/icinga/service-apply.cpp @@ -23,7 +23,7 @@ #include "config/configcompilercontext.hpp" #include "base/initialize.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/context.hpp" #include "base/workqueue.hpp" #include "base/configerror.hpp" diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp index d4455761d..be8daa389 100644 --- a/lib/icinga/servicegroup.cpp +++ b/lib/icinga/servicegroup.cpp @@ -21,7 +21,7 @@ #include "config/objectrule.hpp" #include "base/dynamictype.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/context.hpp" #include "base/workqueue.hpp" #include diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp index c97707564..292373a52 100644 --- a/lib/icinga/timeperiod.cpp +++ b/lib/icinga/timeperiod.cpp @@ -20,7 +20,7 @@ #include "icinga/timeperiod.hpp" #include "base/dynamictype.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/timer.hpp" #include "base/utility.hpp" #include diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp index 9a6e8bbe0..c17a0b622 100644 --- a/lib/icinga/usergroup.cpp +++ b/lib/icinga/usergroup.cpp @@ -21,7 +21,7 @@ #include "config/objectrule.hpp" #include "base/dynamictype.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/context.hpp" #include "base/workqueue.hpp" #include diff --git a/lib/livestatus/attributefilter.cpp b/lib/livestatus/attributefilter.cpp index 118981c59..a62c2ae99 100644 --- a/lib/livestatus/attributefilter.cpp +++ b/lib/livestatus/attributefilter.cpp @@ -21,7 +21,7 @@ #include "base/convert.hpp" #include "base/array.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include #include diff --git a/lib/livestatus/livestatuslistener.cpp b/lib/livestatus/livestatuslistener.cpp index 90baa8b2a..190b4dc6b 100644 --- a/lib/livestatus/livestatuslistener.cpp +++ b/lib/livestatus/livestatuslistener.cpp @@ -23,7 +23,7 @@ #include "base/utility.hpp" #include "base/objectlock.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include "base/tcpsocket.hpp" #include "base/unixsocket.hpp" diff --git a/lib/livestatus/livestatuslogutility.cpp b/lib/livestatus/livestatuslogutility.cpp index c7a85c976..2fa7c895d 100644 --- a/lib/livestatus/livestatuslogutility.cpp +++ b/lib/livestatus/livestatuslogutility.cpp @@ -26,7 +26,7 @@ #include "icinga/notificationcommand.hpp" #include "base/utility.hpp" #include "base/convert.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include #include #include diff --git a/lib/livestatus/livestatusquery.cpp b/lib/livestatus/livestatusquery.cpp index 93f5ad79b..32776d155 100644 --- a/lib/livestatus/livestatusquery.cpp +++ b/lib/livestatus/livestatusquery.cpp @@ -34,7 +34,7 @@ #include "base/debug.hpp" #include "base/convert.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" #include "base/utility.hpp" #include "base/serializer.hpp" diff --git a/lib/livestatus/logtable.cpp b/lib/livestatus/logtable.cpp index b378049a3..56733af20 100644 --- a/lib/livestatus/logtable.cpp +++ b/lib/livestatus/logtable.cpp @@ -33,7 +33,7 @@ #include "icinga/notificationcommand.hpp" #include "base/convert.hpp" #include "base/utility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/application.hpp" #include "base/objectlock.hpp" #include diff --git a/lib/livestatus/statehisttable.cpp b/lib/livestatus/statehisttable.cpp index 82385e608..46ca67750 100644 --- a/lib/livestatus/statehisttable.cpp +++ b/lib/livestatus/statehisttable.cpp @@ -33,7 +33,7 @@ #include "icinga/notificationcommand.hpp" #include "base/convert.hpp" #include "base/utility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/application.hpp" #include "base/objectlock.hpp" #include diff --git a/lib/methods/clrchecktask.cpp b/lib/methods/clrchecktask.cpp index c18c4bb49..298f006ce 100644 --- a/lib/methods/clrchecktask.cpp +++ b/lib/methods/clrchecktask.cpp @@ -23,7 +23,7 @@ #include "icinga/macroprocessor.hpp" #include "icinga/icingaapplication.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/scriptfunction.hpp" #include "base/utility.hpp" #include "base/process.hpp" diff --git a/lib/methods/nullchecktask.cpp b/lib/methods/nullchecktask.cpp index b0e558d83..4e378d353 100644 --- a/lib/methods/nullchecktask.cpp +++ b/lib/methods/nullchecktask.cpp @@ -25,7 +25,7 @@ #include "base/utility.hpp" #include "base/convert.hpp" #include "base/scriptfunction.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" using namespace icinga; diff --git a/lib/methods/nulleventtask.cpp b/lib/methods/nulleventtask.cpp index 39dfaf854..88c0670db 100644 --- a/lib/methods/nulleventtask.cpp +++ b/lib/methods/nulleventtask.cpp @@ -19,7 +19,7 @@ #include "methods/nulleventtask.hpp" #include "base/scriptfunction.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" using namespace icinga; diff --git a/lib/methods/pluginchecktask.cpp b/lib/methods/pluginchecktask.cpp index e261f56fd..c4c260acb 100644 --- a/lib/methods/pluginchecktask.cpp +++ b/lib/methods/pluginchecktask.cpp @@ -23,7 +23,7 @@ #include "icinga/macroprocessor.hpp" #include "icinga/icingaapplication.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/scriptfunction.hpp" #include "base/utility.hpp" #include "base/process.hpp" diff --git a/lib/methods/plugineventtask.cpp b/lib/methods/plugineventtask.cpp index 91096d0c6..345a81d48 100644 --- a/lib/methods/plugineventtask.cpp +++ b/lib/methods/plugineventtask.cpp @@ -23,7 +23,7 @@ #include "icinga/pluginutility.hpp" #include "icinga/icingaapplication.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/scriptfunction.hpp" #include "base/utility.hpp" #include "base/process.hpp" diff --git a/lib/methods/pluginnotificationtask.cpp b/lib/methods/pluginnotificationtask.cpp index c37113263..362c279de 100644 --- a/lib/methods/pluginnotificationtask.cpp +++ b/lib/methods/pluginnotificationtask.cpp @@ -25,7 +25,7 @@ #include "icinga/macroprocessor.hpp" #include "icinga/icingaapplication.hpp" #include "base/scriptfunction.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/utility.hpp" #include "base/process.hpp" #include "base/convert.hpp" diff --git a/lib/methods/randomchecktask.cpp b/lib/methods/randomchecktask.cpp index 6034a9a45..a10e2634f 100644 --- a/lib/methods/randomchecktask.cpp +++ b/lib/methods/randomchecktask.cpp @@ -25,7 +25,7 @@ #include "base/utility.hpp" #include "base/convert.hpp" #include "base/scriptfunction.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" using namespace icinga; diff --git a/lib/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp index 09c08958d..c2da95cf9 100644 --- a/lib/notification/notificationcomponent.cpp +++ b/lib/notification/notificationcomponent.cpp @@ -22,7 +22,7 @@ #include "icinga/icingaapplication.hpp" #include "base/dynamictype.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/utility.hpp" #include "base/exception.hpp" #include "base/statsfunction.hpp" diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp index b2deea515..18397905b 100644 --- a/lib/perfdata/graphitewriter.cpp +++ b/lib/perfdata/graphitewriter.cpp @@ -26,7 +26,7 @@ #include "base/tcpsocket.hpp" #include "base/dynamictype.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/convert.hpp" #include "base/utility.hpp" #include "base/application.hpp" diff --git a/lib/perfdata/perfdatawriter.cpp b/lib/perfdata/perfdatawriter.cpp index 92c4b6784..445f34fc2 100644 --- a/lib/perfdata/perfdatawriter.cpp +++ b/lib/perfdata/perfdatawriter.cpp @@ -23,7 +23,7 @@ #include "icinga/icingaapplication.hpp" #include "base/dynamictype.hpp" #include "base/objectlock.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/convert.hpp" #include "base/utility.hpp" #include "base/context.hpp" diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp index 04f4417f6..966a62f73 100644 --- a/lib/remote/apiclient.cpp +++ b/lib/remote/apiclient.cpp @@ -24,7 +24,7 @@ #include "base/dynamictype.hpp" #include "base/objectlock.hpp" #include "base/utility.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/exception.hpp" using namespace icinga; diff --git a/lib/remote/apilistener-sync.cpp b/lib/remote/apilistener-sync.cpp index 33fdc3535..0a4170acd 100644 --- a/lib/remote/apilistener-sync.cpp +++ b/lib/remote/apilistener-sync.cpp @@ -20,7 +20,7 @@ #include "remote/apilistener.hpp" #include "remote/apifunction.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/convert.hpp" #include #include diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index 17cc98fbb..ca9b5bdcc 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -23,7 +23,7 @@ #include "base/convert.hpp" #include "base/netstring.hpp" #include "base/dynamictype.hpp" -#include "base/logger_fwd.hpp" +#include "base/logger.hpp" #include "base/objectlock.hpp" #include "base/stdiostream.hpp" #include "base/application.hpp"