Remove logger_fwd.hpp

diff --git a/lib/base/application.hpp b/lib/base/application.hpp
index 4b66f257c0b2cafa34d63dbc26c66d69309044b9..eb37138468335d613a03923825a48f95a57b6dd3 100644 (file)
--- 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 d4c76988f9970a0048ba71190b403cd3881c3707..b23ae8287113471d1b801f90f2450019f083d250 100644 (file)
--- 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 <boost/algorithm/string/split.hpp>

diff --git a/lib/base/dynamicobject.cpp b/lib/base/dynamicobject.cpp
index 0d6ac66299e0dd1ff42a77a1b3683a7a6f361404..7a41cdfde7743708de1abb88003294e2aeed956e 100644 (file)
--- 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 56d318279bb1b6c6d95a9b6e429af67c3bc38f65..d8b0bc1628e80d327f038008fff3307374adc936 100644 (file)
--- 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 <set>
 
 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 (file)
index 3661e1f..0000000
--- 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 9ad9197ae1f06a89f1b5fdf259a80930f85863bd..39630e824b944f95a1e6d390ae271d6f91572e30 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp
index 8aacbc00d8a69c86fbee3bfec165eba6c4cc18c5..c24e3ba7538ce2c432c0319e66b8756a38108b43 100644 (file)
--- 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 <boost/foreach.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>

diff --git a/lib/base/socket.cpp b/lib/base/socket.cpp
index 7d79980a98ec91542cb9d5dc418ac7638e23ccc8..562ddd9bfd3b7bde80c061838160532751c50f6e 100644 (file)
--- 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 <sstream>
 #include <iostream>
 #include <boost/exception/errinfo_api_function.hpp>

diff --git a/lib/base/tcpsocket.cpp b/lib/base/tcpsocket.cpp
index 46fd1df283cad5b9d4605b68d8aaae5a9d3a2c89..5bdcd991b0abdbca1cad0404652bdf5f461d0319 100644 (file)
--- 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 <boost/exception/errinfo_api_function.hpp>

diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp
index 5197bf7bc411d6fb25d3a97a191295f2809d7aea..77fb7d35cd6668dd793044053aeb6b7f2e55b34b 100644 (file)
--- 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 a2d81217142fb257bcbf77cc0527112cbc446a2f..7d96fba8f7af2dd80784f9e1cc8e78436f0974f3 100644 (file)
--- 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 <boost/bind.hpp>
 #include <iostream>
 

diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp
index 566d43112b95538a41e974fe725fb2ddbc1e6d35..963de55360fb624aec8f4c4ccdd3c5f2381ef0e7 100644 (file)
--- 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 eeadf1178e5af0dabace2e022a86ef0260ec2f83..b6b86ad3722c73e197cc4e3830d951e44ce6a397 100644 (file)
--- 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 1a1a87ca5645dd7d4134c5ca54896ed54bbfe522..17f05811ef146b920530a8c83bb77c4f77b4ec5e 100644 (file)
--- 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 <boost/bind.hpp>
 #include <boost/foreach.hpp>

diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp
index 83c2368a87c6eb89c2a293fcedc1ea828befb0fd..708d2422870a62555acdf1a141078097450c81b9 100644 (file)
--- 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 992e4d6ecaabd8547ad22f2b3a0c37f4df2ff826..ab7e06d8aa65b91ca3bb7cbf3a80f64292fc156b 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/cli/agentblackandwhitelistcommand.cpp b/lib/cli/agentblackandwhitelistcommand.cpp
index 02fbc1fc2d7eb984cba82702b6cae747c44c3210..6406b011d84111be1320559419d9b308da8e9c96 100644 (file)
--- 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 8163f9edbe3bf9f2614b53d4d847a92cf557bace..132472aa462d7be757dc16b3388f95e19a36eb58 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/cli/agentremovecommand.cpp b/lib/cli/agentremovecommand.cpp
index aa082738b2804e94686a3ccc734ea3cb16ad982d..194ac1d2864fd88a4d77cf73d7eb84978a29e61f 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/cli/agentsetcommand.cpp b/lib/cli/agentsetcommand.cpp
index 8f658bcc58c118cccf8692938914ee93ef055a47..b6421ffaa64697670efa676e6620a09650db8466 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/cli/agentsetupcommand.cpp b/lib/cli/agentsetupcommand.cpp
index 11c06acc93822e8f1c8423459ccc8b36f89a086f..d86f7a02ae2d8a34a4157235dfe8b83e50af463d 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/cli/agentupdateconfigcommand.cpp b/lib/cli/agentupdateconfigcommand.cpp
index 8a80d7b5a9a01a3b1e6f9877a4e059362169845b..df2828cf9fd112b45ff122b94a5a4d1d78c275da 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/cli/agentwizardcommand.cpp b/lib/cli/agentwizardcommand.cpp
index 8ec686f55bc97fa544348c915a5773ead1fe95d3..3e42ddcc115718837b1ac7cb079c4d2b24f74348 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index 735566283f139702fc19be90fbc27bfa94d285b0..09841a860bcf6e5e13ea472bc468028a297b7288 100644 (file)
--- 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 38d341752e31e4787c351bf60602aaa1709f0849..ceb99bbd784c38281e34e0ed706845b8d8fb3980 100644 (file)
--- 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 eb518f96edc27aaefe80a29d1743054354b0079c..fdaa3f54f334c12ceda682667dbdce33c69f9466 100644 (file)
--- 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 c5e09040d3420a6a731b65255620fe2bf166577e..58e651eab1e46a905f182b57924ff2a4699ef625 100644 (file)
--- 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 91ab66d882ca13b20be3d8eafcb7442e2c7c2712..dcb689b4cd4320d6bc9af85e1de592ed26e550a1 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/cli/objectlistcommand.cpp b/lib/cli/objectlistcommand.cpp
index db8e2b3b1fd70effe2043798c9621fca8680efac..8c122e8e8ee9e4c41d78c4b1d4e79b3ad79f975d 100644 (file)
--- 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 373ab7d49ce8ec4e3e36be0c2da50d46a0edbec0..c7a106046db71e1f46850a39db80906bd967ca13 100644 (file)
--- 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 fac38fd62da3045335b15d706a77f7b731c2eb43..530b27f105f6fe82cadd828a9e1887578974332e 100644 (file)
--- 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 f238197f879846d156ca11dfbfc6744f5414fd4c..2ed8baeb1b97e413899e6b273ecf6d35b3282ab4 100644 (file)
--- 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 c69622ff1c09e737eebfa636f0b1288e0fa9054c..5b7ce8488b006c896d4c9ee5ee8cc9c37dd2b0f8 100644 (file)
--- 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 2dc2932e181764aec457e54922beec94c42fe47d..7510ab287fd9354f77692eeb3a755630d7cfb5d0 100644 (file)
--- 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 d0e840722c3ecce478bfb2aeb34e36b1ebd6bde4..8c4eeeef8435500312ac3c0c9a98d4be9e00b508 100644 (file)
--- 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 37920d36d766c33c7b3a79631f3ff0cb82f6b318..d925300ca28edcc38b4cecb8b9964b7750db6d31 100644 (file)
--- 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 e4ca628e653f9ee2febce4f211ad3d20501c7e0b..108f5ef1767ed48ba7f82894cdecded2478994a4 100644 (file)
--- 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 dca4ea3f546723fc84d3996f1a12265c8cda525d..2a3dd68cf952c8cac32f52cc5593a5814c119906 100644 (file)
--- 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 e4c3549d48e271cbdb1a5a5b5f7d6c42fa4091a8..5fb97407e10c6ab00f7cdd755424f67b6fb679a4 100644 (file)
--- 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 b21995af8c6509f56ee05dbee7cd977d1c0e4f1d..737b47d7ca52ef7d0b63a09c64b145b1c21ca892 100644 (file)
--- 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 <boost/foreach.hpp>
 #include <set>
 

diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp
index 76e4d83124c209628b10acd40061f1200bb89848..c58b876bdf5f72db926ae23304fdbddeed2d736e 100644 (file)
--- 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 44f941cdc3a34afe5f5ea87e3f2b2e219f3322d1..eb3c2af780a59ec7c421958dfe4223c830432fce 100644 (file)
--- 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 78f354a54458a69453d9f1766d277502b505d14d..090476e0fd16dbf6ecc6cd72115cb1217f3c25f1 100644 (file)
--- 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 <boost/foreach.hpp>
 #include <boost/exception_ptr.hpp>

diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
index cc6c3f70c1598807cab1e18bf4580520bfd4fc38..f5c13bc434ab57e8ea507de497a9070e5fb00d71 100644 (file)
--- 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 <boost/foreach.hpp>
 

diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp
index 038b9657a025741b562a1f9c159941bde6916e86..a803ed2bcafd3d9632f892ba5a7c5b52bc39771d 100644 (file)
--- 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 48c98c1b31bb9526b72bb95770e2b23096013099..f9c5a335b87eba6a129e95aaba873683398d9e44 100644 (file)
--- 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 <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/endpointdbobject.cpp b/lib/db_ido/endpointdbobject.cpp
index 49fbed5c2b540c1fd7f358b43a89b1264ac93e29..90c4775502e1eecc450f6518cb1d9f2f4d447983 100644 (file)
--- 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 <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
index ff43697c811dff1d99dbd6c36edb8e2d4ed1a2cd..b3bd6bdd8af4c7263ecd466b588e2f1488a016ef 100644 (file)
--- 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 <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index 6a8cc1c3694a62ee59f4aef7688e73d7b8007298..f8db77b10da62b050e4e32d176f323919884cecb 100644 (file)
--- 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 <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>
 

diff --git a/lib/db_ido/userdbobject.cpp b/lib/db_ido/userdbobject.cpp
index 1a37bae617d76ccfc9aa45cb42351293cada2f83..a5481e1428d9bb4c3bafae9abb7794a95ab2e1b2 100644 (file)
--- 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 <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index df75ef44a2895ab0648fc6c4b2a9f7daea157fc1..d80efd6331960fddc7eee0223a11e84edcfe173e 100644 (file)
--- 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 d77f84c4302c00713952999695ae42faa1907593..28eb34470a47232a90991c29f8527d531dc1abdd 100644 (file)
--- 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 250302c57362f053ed1e68410f4bcf53930714b9..4d163a65b62d6b0b6b6c2b26e629042f9bf613d5 100644 (file)
--- 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 a75becd4b36ffc8c183cd8862cc76d7d09819cde..bd9d0597fcbc5134db7cbfadc6d5f733383f5727 100644 (file)
--- 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 7c8c10d4c4f56cfacf963bb4f6929e64531775ca..9e6afed7e901d1efadb75a8a483630dddf115fb9 100644 (file)
--- 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 50150b7579d130d4b3e7ce320bdbc6d633dd80d6..af37cead8c1a8f215740fe705dbd489f1716850f 100644 (file)
--- 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 736398c5f8c242e0533d6da3768ff8974470a4a9..ae6497c79fb0fe6c05d554e965d18962eb2a9670 100644 (file)
--- 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 <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/checkable-dependency.cpp b/lib/icinga/checkable-dependency.cpp
index 4a6828b850eb5764db486641174e0bcb02820f36..d6e87133ee37bd4bab3e52a06bb0c5a86b43de0e 100644 (file)
--- 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 <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/checkable-downtime.cpp b/lib/icinga/checkable-downtime.cpp
index d793cf847a4ba524b8437a9d9e8905f1f7a8898a..20207f02e2d6f7868507e2a8b2d86f3fab879e4b 100644 (file)
--- 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 a126b282f76d0608c44b457b5640293a74bf2fe2..afc9235e2d932809112d057671ca9c1790a7443b 100644 (file)
--- 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 28b92a72dc9d27443d0eb8a478f63b4bdcc70b79..01ec04c914004c34cf66afe945e1a46577d7b7cb 100644 (file)
--- 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 75ad2ed66a5c51ccfee0cb5609876f5b0f410163..095055220b2ed939162686e76c10aeadad970655 100644 (file)
--- 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 c546de0cca791279e2732d3e78be62755215e603..9133bc5c4ce69872c7100628765187185f45d9b5 100644 (file)
--- 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 3bfae8874e7a8e065b6102c9a3f32496c79397a6..3b38261773b82d13bcaee1e5e32808d1f88277c5 100644 (file)
--- 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 <boost/foreach.hpp>
 

diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
index 2a7b632d9a724c26661676b67165737a78c62815..d938130fe0926528cd4c5ba5651a5110a72ff0a3 100644 (file)
--- 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 dc4d95ccb7ad8e1d1dd68f9f491469858ffcd67e..8c2ccae1fb5ce9d06cd535fb26099ccde3adf4fe 100644 (file)
--- 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 c0393b319d2899e57e1127ec2d0db6d4c358d345..6ecb1e14625ad41ed5da5ce663b319fc1915bb55 100644 (file)
--- 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 a0c52f5d1b409dbf4b2ca741c0711a0bd9569e92..ac49481312f44490c8246bd48c9914265fea40a3 100644 (file)
--- 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 a1c70a655d2bf828e41c7c9624919c16b67a7d2c..fc87ae660d086c6ca3bff7db82069172ea8b449c 100644 (file)
--- 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 <boost/algorithm/string/split.hpp>

diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp
index cd2d8456298116f441fc3042f550368a3e433ad3..09c04ba2be4c360f5083dae150f5994cca472bf0 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/icinga/notification-apply.cpp b/lib/icinga/notification-apply.cpp
index 961abbc5b98ba585393033c302c23a1c3c1af1f6..3c0b64ed68e3849c07139054a621f310167b3893 100644 (file)
--- 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 361ccaa6b4db87e8f800508c5dedbe1a4b8df913..1031c28844d2554c36abfe28020759387a7441ba 100644 (file)
--- 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 9f8810ae7cc7440603da4987932c1a6668f208a0..4ad707db83f64016e8a599719a8671c38a8ac862 100644 (file)
--- 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 d6a8edbfbdaeffa04cc927a0c631f5d1d3eb1797..1721533762eeb22c8c44b76048e61800741f2bd9 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
index 43f4113aefb7d12567415fd8347be48bfe1356cd..fa772207599d43cf725fef2e0e8f761ff6c25d44 100644 (file)
--- 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 <boost/foreach.hpp>
 

diff --git a/lib/icinga/service-apply.cpp b/lib/icinga/service-apply.cpp
index 86b72e9a33011f129700373b817c29d234a080e5..9ba215dbb07d0c7989daf31766680eacfb080dcd 100644 (file)
--- 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 d4455761d6ce2195098812c0ac4dc6579f92cebe..be8daa3890349a95ce9c57de696d79c6bbb0b28e 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp
index c977075645ad3196cb182be3ea3c51ee0a8e608d..292373a520b942f3a7629ded3e41591592532a77 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp
index 9a6e8bbe05928d8d4b2212085f8f99b695788c58..c17a0b6228f409c32bf2788911b98d5dd1f182d2 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/livestatus/attributefilter.cpp b/lib/livestatus/attributefilter.cpp
index 118981c59034407e1117a59c5d0718f943196ba0..a62c2ae99a9e3d0ffbfcb0d2b082aa9b3d2a1d65 100644 (file)
--- 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 <boost/foreach.hpp>
 #include <boost/regex.hpp>
 

diff --git a/lib/livestatus/livestatuslistener.cpp b/lib/livestatus/livestatuslistener.cpp
index 90baa8b2a33d26ede50c1a07df9164fe67457dcd..190b4dc6b9a5026b30603142dd3fb5db95c9257f 100644 (file)
--- 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 c7a85c97660b8843fcde359376fdfaaf103273bc..2fa7c895d57666f25dba60c7cbb232d77ffd7e41 100644 (file)
--- 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 <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string.hpp>

diff --git a/lib/livestatus/livestatusquery.cpp b/lib/livestatus/livestatusquery.cpp
index 93f5ad79be69cd188268d48cc5555adbaff14541..32776d155d1991374edf0082515bbbca9fb60c76 100644 (file)
--- 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 b378049a313c7387738546a1f6076fe08a040c32..56733af20c4fbbdb59e1a8670501e9febcb47130 100644 (file)
--- 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 <boost/foreach.hpp>

diff --git a/lib/livestatus/statehisttable.cpp b/lib/livestatus/statehisttable.cpp
index 82385e608040feab3dd57a6be592452460af701d..46ca6775040e12621c6fea0854723993f28e6073 100644 (file)
--- 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 <boost/smart_ptr/make_shared.hpp>

diff --git a/lib/methods/clrchecktask.cpp b/lib/methods/clrchecktask.cpp
index c18c4bb49be22d90b797976d547cf50a07c74eee..298f006ce59247cdcd1d4acc59f22eec9b422a56 100644 (file)
--- 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 b0e558d8309d62d1a9de5ff53a77b158d49a5b29..4e378d3534fc65932023f8c288e159f51b96cc33 100644 (file)
--- 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 39dfaf854b099506575595eea197d6fb07e90db6..88c0670dbf816d06159bb3c7b9d86f05aa13b783 100644 (file)
--- 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 e261f56fd64842e5b57d6135887010fc18b3c08e..c4c260acb33c762047062c6ed258c22cabfcb78c 100644 (file)
--- 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 91096d0c6a6a8e3b4c5d9419bcc92bff74f7c4cc..345a81d48f9d7d3fe4ed96f02431d00a725cd82e 100644 (file)
--- 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 c37113263acde118cb30f4f2b4c6ff08dfc5b22c..362c279de46abd8e5655b1e1a8a8713cc8229798 100644 (file)
--- 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 6034a9a453a35a15bf74fab7a91b18c084a94846..a10e2634f4e17a44fbf1defd1424334e8974ef87 100644 (file)
--- 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 09c08958dfb0a2083d49490de045c21d0f02d7f5..c2da95cf9bbee487d76af4736239fb01a6921ba9 100644 (file)
--- 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 b2deea515478413b288480ba62c88fa11f8b3677..18397905b6d7f7bc22bf4e4ec39af0fb75c1c927 100644 (file)
--- 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 92c4b6784459f104af6dc28911fc080085c704fd..445f34fc298ae93c3c20727d533677a9e13618fa 100644 (file)
--- 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 04f4417f6d4f4046dec23448f49d48a15af4cf9f..966a62f73cfc02d1cc642bd683bf495e89ead90b 100644 (file)
--- 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 33fdc3535371d262a60760e3e131371cecf7c049..0a4170acd6d9de67c21e7dd440e50dbfb4b2fc59 100644 (file)
--- 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 <boost/foreach.hpp>
 #include <fstream>

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 17cc98fbb4b5eaf7d2096f2a366ec37662e6a9f7..ca9b5bdcc954ae35ea941046d8d8b7f58791b183 100644 (file)
--- 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"