MXS-2197 Remove most includes of maxscale/log.hh

All cc-files should include maxscale/ccdefs.hh, which includes maxscale/log.hh. Consequently it need not be included again.
2018-12-10 12:35:57 +02:00 · 2018-12-10 12:35:57 +02:00 · 0927a0b938
commit 0927a0b938
parent dc8c2f27f7
27 changed files with 3 additions and 48 deletions
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@ -44,7 +44,6 @@
 #include <maxscale/clock.h>
 #include <maxscale/limits.h>
 #include <maxscale/listener.hh>
-#include <maxscale/log.hh>
 #include <maxscale/poll.hh>
 #include <maxscale/router.hh>
 #include <maxscale/server.hh>
--- a/server/core/externcmd.cc
+++ b/server/core/externcmd.cc
@ -23,7 +23,6 @@

 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log.hh>
 #include <maxscale/pcre2.h>

 /**
--- a/server/core/maxkeys.cc
+++ b/server/core/maxkeys.cc
@ -13,23 +13,13 @@

 /**
 * @file maxkeys.c  - Create the random encryption keys for maxscale
- *
- * @verbatim
- * Revision History
- *
- * Date         Who             Description
- * 24/07/13     Mark Riddoch    Initial implementation
- *
- * @endverbatim
 */
-#include "internal/secrets.h"
-
+#include <maxscale/ccdefs.hh>
 #include <getopt.h>
 #include <stdio.h>
-
-#include <maxscale/log.hh>
 #include <maxscale/paths.h>
 #include <maxscale/random.h>
+#include "internal/secrets.h"

 #ifdef HAVE_GLIBC
 struct option options[] =
--- a/server/core/maxpasswd.cc
+++ b/server/core/maxpasswd.cc
@ -13,14 +13,6 @@

 /**
 * @file maxpasswd.c  - Implementation of pasword encoding
- *
- * @verbatim
- * Revision History
- *
- * Date         Who             Description
- * 24/07/13     Mark Riddoch    Initial implementation
- *
- * @endverbatim
 */

 #include <maxscale/ccdefs.hh>
@ -31,7 +23,6 @@
 #include <getopt.h>

 #include <maxscale/paths.h>
-#include <maxscale/log.hh>
 #include <maxscale/random.h>
 #include <maxscale/alloc.h>

--- a/server/core/test/test_config.cc
+++ b/server/core/test/test_config.cc
@ -17,7 +17,6 @@
 #endif

 #include <iostream>
-#include <maxscale/log.hh>
 #include "../config.cc"

 using namespace std;
--- a/server/core/test/test_event.cc
+++ b/server/core/test/test_event.cc
@ -21,7 +21,6 @@
 #include <iostream>
 #include <sstream>
 #include <maxbase/assert.h>
-#include <maxscale/log.hh>

 using namespace maxscale;
 using namespace std;
--- a/server/core/test/test_logthrottling.cc
+++ b/server/core/test/test_logthrottling.cc
@ -11,6 +11,7 @@
 * Public License.
 */

+#include <maxscale/log.hh>
 #include <unistd.h>
 #include <cstdio>
 #include <stdint.h>
@ -20,7 +21,6 @@
 #include <pthread.h>
 #include <sched.h>
 #include <semaphore.h>
-#include <maxscale/log.hh>
 #include <maxscale/random.h>

 using std::cerr;
--- a/server/modules/filter/dbfwfilter/rules.cc
+++ b/server/modules/filter/dbfwfilter/rules.cc
@ -17,7 +17,6 @@

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

--- a/server/modules/protocol/MySQL/mysql_common.cc
+++ b/server/modules/protocol/MySQL/mysql_common.cc
@ -23,7 +23,6 @@

 #include <maxscale/alloc.h>
 #include <maxscale/clock.h>
-#include <maxscale/log.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/protocol/mysql.hh>
--- a/server/modules/protocol/MySQL/rwbackend.cc
+++ b/server/modules/protocol/MySQL/rwbackend.cc
@ -15,7 +15,6 @@

 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
-#include <maxscale/log.hh>

 namespace maxscale
 {
--- a/server/modules/routing/avrorouter/avro.cc
+++ b/server/modules/routing/avrorouter/avro.cc
@ -32,7 +32,6 @@
 #include <maxbase/worker.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
--- a/server/modules/routing/avrorouter/avro_client.cc
+++ b/server/modules/routing/avrorouter/avro_client.cc
@ -29,7 +29,6 @@
 #include <maxscale/router.hh>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.hh>
 #include <maxscale/version.h>
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.hh>
--- a/server/modules/routing/avrorouter/avro_converter.cc
+++ b/server/modules/routing/avrorouter/avro_converter.cc
@ -17,7 +17,6 @@

 #include <maxbase/assert.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log.hh>

 /**
 * @brief Allocate an Avro table
--- a/server/modules/routing/avrorouter/avro_file.cc
+++ b/server/modules/routing/avrorouter/avro_file.cc
@ -33,7 +33,6 @@
 #include <sys/stat.h>

 #include <maxscale/alloc.h>
-#include <maxscale/log.hh>
 #include <maxscale/maxscale.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/utils.h>
--- a/server/modules/routing/avrorouter/avro_main.cc
+++ b/server/modules/routing/avrorouter/avro_main.cc
@ -28,7 +28,6 @@
 #include <maxbase/worker.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
--- a/server/modules/routing/avrorouter/avro_schema.cc
+++ b/server/modules/routing/avrorouter/avro_schema.cc
@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <limits.h>
 #include <unistd.h>
-#include <maxscale/log.hh>
 #include <sys/stat.h>
 #include <errno.h>
 #include <string.h>
--- a/server/modules/routing/binlogrouter/binlog_common.cc
+++ b/server/modules/routing/binlogrouter/binlog_common.cc
@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <blr_constants.hh>
-#include <maxscale/log.hh>

 /**
 * @file binlog_common.c - Common binary log code shared between multiple modules
--- a/server/modules/routing/binlogrouter/blr.cc
+++ b/server/modules/routing/binlogrouter/blr.cc
@ -41,7 +41,6 @@
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/router.hh>
 #include <maxscale/secrets.h>
--- a/server/modules/routing/binlogrouter/blr_cache.cc
+++ b/server/modules/routing/binlogrouter/blr_cache.cc
@ -35,9 +35,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>

-#include <maxscale/log.hh>
-
-
 /**
 * Initialise the cache for this instanceof the binlog router. As a side
 * effect also determine the binlog file to read and the position to read
--- a/server/modules/routing/binlogrouter/blr_file.cc
+++ b/server/modules/routing/binlogrouter/blr_file.cc
@ -34,7 +34,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/encryption.h>
-#include <maxscale/log.hh>
 #include <maxscale/paths.h>
 #include <maxscale/router.hh>
 #include <maxscale/secrets.h>
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@ -45,7 +45,6 @@
 #include <maxscale/buffer.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/router.hh>
 #include <maxscale/routingworker.hh>
--- a/server/modules/routing/binlogrouter/blr_slave.cc
+++ b/server/modules/routing/binlogrouter/blr_slave.cc
@ -39,7 +39,6 @@
 #include <maxscale/clock.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.hh>
 #include <maxscale/maxscale.h>
 #include <maxscale/poll.hh>
 #include <maxscale/router.hh>
--- a/server/modules/routing/binlogrouter/maxbinlogcheck.cc
+++ b/server/modules/routing/binlogrouter/maxbinlogcheck.cc
@ -28,7 +28,6 @@
 #include <sys/stat.h>

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


 static void printVersion(const char* progname);
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@ -35,7 +35,6 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>
 #include <time.h>
-#include <maxscale/log.hh>
 #include <maxscale/paths.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.hh>
--- a/server/modules/routing/cli/cli.cc
+++ b/server/modules/routing/cli/cli.cc
@ -34,7 +34,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.hh>
 #include <maxscale/router.hh>
--- a/server/modules/routing/debugcli/debugcli.cc
+++ b/server/modules/routing/debugcli/debugcli.cc
@ -33,7 +33,6 @@
 #include <maxbase/atomic.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.hh>
-#include <maxscale/log.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.hh>
 #include <maxscale/router.hh>
--- a/server/modules/routing/debugcli/debugcmd.cc
+++ b/server/modules/routing/debugcli/debugcmd.cc
@ -43,7 +43,6 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log.hh>
 #include <maxscale/maxscale.h>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/router.hh>