MXS-2197 Rename maxscale/log.h to maxscale/log.hh

In files either include maxscale/log.hh or remove include entirelly as maxscale/ccdefs.hh includes it.
2018-12-10 11:20:01 +02:00
parent 1b5b789342
commit c0c9a9858d
116 changed files with 64 additions and 123 deletions
--- a/server/modules/filter/cache/storagefactory.cc
+++ b/server/modules/filter/cache/storagefactory.cc
@ -18,7 +18,6 @@
 #include <new>
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
-#include <maxscale/log.h>
 #include "cachefilter.hh"
 #include "lrustoragest.hh"
 #include "lrustoragemt.hh"
--- a/server/modules/filter/cache/test/testkeygeneration.cc
+++ b/server/modules/filter/cache/test/testkeygeneration.cc
@ -18,7 +18,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
-#include <maxscale/log.h>
 #include "storagefactory.hh"
 #include "cache.hh"
 #include "cache_storage_api.hh"
--- a/server/modules/filter/cache/test/testrules.cc
+++ b/server/modules/filter/cache/test/testrules.cc
@ -16,7 +16,6 @@
 #include <iostream>
 #include <maxscale/alloc.h>
 #include <maxscale/config.hh>
-#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/query_classifier.h>
--- a/server/modules/filter/cache/test/teststorage.cc
+++ b/server/modules/filter/cache/test/teststorage.cc
@ -17,7 +17,6 @@
 #include <iostream>

 #include <maxscale/alloc.h>
-#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/utils.h>
--- a/server/modules/filter/ccrfilter/ccrfilter.cc
+++ b/server/modules/filter/ccrfilter/ccrfilter.cc
@ -20,7 +20,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/filter.hh>
 #include <maxscale/hint.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/pcre2.h>
--- a/server/modules/filter/dbfwfilter/dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc
@ -72,7 +72,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/modutil.hh>
-#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/pcre2.h>
 #include <maxscale/alloc.h>
--- a/server/modules/filter/dbfwfilter/rules.cc
+++ b/server/modules/filter/dbfwfilter/rules.cc
@ -17,7 +17,7 @@

 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
-#include <maxscale/log.h>
+#include <maxscale/log.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>

--- a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
@ -14,7 +14,6 @@
 #include <cstdlib>
 #include <memory>
 #include <iostream>
-#include <maxscale/log.h>
 #include <maxscale/filtermodule.hh>
 #include <maxscale/queryclassifiermodule.hh>
 #include <maxscale/mock/backend.hh>
--- a/server/modules/filter/hintfilter/hintparser.cc
+++ b/server/modules/filter/hintfilter/hintparser.cc
@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <maxscale/log.h>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
--- a/server/modules/filter/insertstream/insertstream.cc
+++ b/server/modules/filter/insertstream/insertstream.cc
@ -13,13 +13,12 @@

 #define MXS_MODULE_NAME "insertstream"

-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>

 #include <strings.h>
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
 #include <maxscale/filter.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/poll.hh>
--- a/server/modules/filter/luafilter/luafilter.cc
+++ b/server/modules/filter/luafilter/luafilter.cc
@ -53,7 +53,6 @@ extern "C"
 #include <mutex>
 #include <maxscale/alloc.h>
 #include <maxscale/filter.hh>
-#include <maxscale/log.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.h>
 #include <maxscale/session.hh>
--- a/server/modules/filter/maxrows/maxrows.cc
+++ b/server/modules/filter/maxrows/maxrows.cc
@ -17,7 +17,7 @@

 #define MXS_MODULE_NAME "maxrows"

-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>

 #include <stdbool.h>
 #include <stdint.h>
@ -26,7 +26,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
 #include <maxscale/filter.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>
--- a/server/modules/filter/mqfilter/mqfilter.cc
+++ b/server/modules/filter/mqfilter/mqfilter.cc
@ -59,6 +59,7 @@

 #define MXS_MODULE_NAME "mqfilter"

+#include <maxscale/ccdefs.hh>
 #include <stdio.h>
 #include <fcntl.h>
 #include <maxscale/filter.hh>
@ -73,7 +74,6 @@
 #include <amqp_tcp_socket.h>
 #include <amqp_ssl_socket.h>
 #include <maxscale/protocol/mysql.hh>
-#include <maxscale/log.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/session.hh>
 #include <maxscale/housekeeper.h>
--- a/server/modules/filter/namedserverfilter/namedserverfilter.cc
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.cc
@ -39,7 +39,6 @@

 #include <maxscale/alloc.h>
 #include <maxscale/hint.h>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/server.hh>
--- a/server/modules/filter/qlafilter/qlafilter.cc
+++ b/server/modules/filter/qlafilter/qlafilter.cc
@ -40,7 +40,6 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/filter.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/pcre2.h>
--- a/server/modules/filter/regexfilter/regexfilter.cc
+++ b/server/modules/filter/regexfilter/regexfilter.cc
@ -13,14 +13,13 @@

 #define MXS_MODULE_NAME "regexfilter"

-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 #include <string.h>
 #include <stdio.h>
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/config.hh>
 #include <maxscale/filter.hh>
-#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/pcre2.h>
--- a/server/modules/filter/tee/tee.cc
+++ b/server/modules/filter/tee/tee.cc
@ -21,7 +21,6 @@

 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log.h>
 #include <maxscale/modulecmd.hh>

 #include "tee.hh"
--- a/server/modules/filter/topfilter/topfilter.cc
+++ b/server/modules/filter/topfilter/topfilter.cc
@ -34,12 +34,12 @@

 #define MXS_MODULE_NAME "topfilter"

+#include <maxscale/ccdefs.hh>
 #include <stdio.h>
 #include <fcntl.h>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/log.h>
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>
--- a/server/modules/filter/tpmfilter/tpmfilter.cc
+++ b/server/modules/filter/tpmfilter/tpmfilter.cc
@ -42,7 +42,7 @@

 #define MXS_MODULE_NAME "tpmfilter"

-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>

 #include <ctype.h>
 #include <stdio.h>
@ -59,7 +59,6 @@
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/log.h>
 #include <maxscale/server.hh>
 #include <maxbase/atomic.h>
 #include <maxscale/query_classifier.h>