Remove logger_fwd.hpp

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
 {

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 <boost/algorithm/string/split.hpp>

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"

lib/base/logger.hpp

@@ -22,12 +22,25 @@
 
 #include "base/i2-base.hpp"
 #include "base/logger.thpp"
-#include "base/logger_fwd.hpp"
 #include <set>
 
 namespace icinga
 {
 
+/**
+ * Log severity.
+ *
+ * @ingroup base
+ */
+enum LogSeverity
+{
+	LogDebug,
+	LogNotice,
+	LogInformation,
+	LogWarning,
+	LogCritical
+};
+
 /**
  * A log entry.
  *

lib/base/logger_fwd.hpp

@@ -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 */

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 <boost/foreach.hpp>

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 <boost/foreach.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>

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 <sstream>
 #include <iostream>
 #include <boost/exception/errinfo_api_function.hpp>

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 <boost/exception/errinfo_api_function.hpp>

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"

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 <boost/bind.hpp>
 #include <iostream>
 

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"
 

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"

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 <boost/bind.hpp>
 #include <boost/foreach.hpp>

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"

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 <boost/foreach.hpp>

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"

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 <boost/foreach.hpp>

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 <boost/foreach.hpp>

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 <boost/foreach.hpp>

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 <boost/foreach.hpp>

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 <boost/foreach.hpp>

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 <boost/foreach.hpp>

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"

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"

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"

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"

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 <boost/foreach.hpp>

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

lib/config/applyrule.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "config/applyrule.hpp"
-#include "base/logger_fwd.hpp"
+#include "base/logger.hpp"
 #include <boost/foreach.hpp>
 #include <set>
 

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"

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"

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 <boost/foreach.hpp>
 #include <boost/exception_ptr.hpp>

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 <boost/foreach.hpp>
 

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"

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 <boost/foreach.hpp>
 
 using namespace icinga;

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 <boost/foreach.hpp>
 
 using namespace icinga;

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 <boost/foreach.hpp>
 
 using namespace icinga;

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 <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>
 

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 <boost/foreach.hpp>
 
 using namespace icinga;

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"

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"

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;
 

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;
 

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;
 

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"

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 <boost/foreach.hpp>
 
 using namespace icinga;

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 <boost/foreach.hpp>
 
 using namespace icinga;

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"

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;

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"

lib/icinga/customvarobject.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/customvarobject.hpp"
-#include "base/logger_fwd.hpp"
+#include "base/logger.hpp"
 
 using namespace icinga;
 

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"

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 <boost/foreach.hpp>
 

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"

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"

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"

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"

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 <boost/algorithm/string/split.hpp>

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 <boost/foreach.hpp>

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"

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"

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"

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 <boost/foreach.hpp>

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 <boost/foreach.hpp>
 

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"

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 <boost/foreach.hpp>

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 <boost/foreach.hpp>

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 <boost/foreach.hpp>

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 <boost/foreach.hpp>
 #include <boost/regex.hpp>
 

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"

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 <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string.hpp>

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"

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 <boost/foreach.hpp>

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 <boost/smart_ptr/make_shared.hpp>

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"

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;
 

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;
 

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"

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"

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"

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;
 

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"

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"

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"

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;

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 <boost/foreach.hpp>
 #include <fstream>

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"