MXS-2014 Rename log_manager.h to log.h

There's nothing resembling a manager anymore.

avro/maxavro.c

@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "maxavro_internal.h"
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <errno.h>
 
 /** Maximum byte size of an integer value */

avro/maxavro_file.c

@@ -14,7 +14,7 @@
 #include "maxavro_internal.h"
 #include <errno.h>
 #include <string.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <zlib.h>
 
 static bool maxavro_read_sync(FILE *file, uint8_t* sync)

avro/maxavro_record.c

@@ -15,7 +15,7 @@
 #include "maxavro_internal.h"
 #include <string.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <errno.h>
 
 bool maxavro_read_datablock_start(MAXAVRO_FILE *file);

avro/maxavro_schema.c

@@ -15,7 +15,7 @@
 #include <jansson.h>
 #include <string.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 static const MAXAVRO_SCHEMA_FIELD types[MAXAVRO_TYPE_MAX] =
 {

avro/maxavro_write.c

@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "maxavro_internal.h"
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <errno.h>
 
 /**

include/maxscale/ccdefs.hh

@@ -24,7 +24,7 @@
 
 #include <maxscale/cdefs.h>
 #include <maxbase/ccdefs.hh>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /**
  * All classes of MaxScale are defined in the namespace @c maxscale.

include/maxscale/customparser.hh

@@ -13,7 +13,7 @@
  */
 
 #include <maxscale/ccdefs.hh>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modutil.h>
 #include <ctype.h>
 

include/maxscale/debug.h

@@ -16,7 +16,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/session.h

@@ -24,7 +24,7 @@
 #include <maxbase/jansson.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/spinlock.h>
 
 MXS_BEGIN_DECLS

query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc

@@ -61,7 +61,7 @@
 #include <pthread.h>
 
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/platform.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.h>

query_classifier/qc_sqlite/qc_sqlite.cc

@@ -29,7 +29,7 @@
 #include <mutex>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/platform.h>

query_classifier/test/classify.c

@@ -20,7 +20,7 @@
 #include <mysql.h>
 #include <unistd.h>
 #include <maxscale/paths.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 char* append(char* types, const char* type_name, size_t* lenp)
 {

query_classifier/test/compare.cc

@@ -22,7 +22,7 @@
 #include <sstream>
 #include <my_config.h>
 #include <maxscale/paths.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
 #include "../../server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh"

query_classifier/test/qc_cache.cc

@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <chrono>
 #include <iostream>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.h>

query_classifier/test/version_sensitivity.cc

@@ -12,7 +12,7 @@
  */
 
 #include <iostream>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/server.h>

server/core/CMakeLists.txt

@@ -20,7 +20,7 @@ add_library(maxscale-common SHARED
   json_api.cc
   listener.cc
   load_utils.cc
-  log_manager.cc
+  log.cc
   mariadb.cc
   maxscale_pcre2.cc
   misc.cc

server/core/adminusers.cc

@@ -23,7 +23,7 @@
 
 #include <maxscale/users.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/json_api.h>
 

server/core/alloc.cc

@@ -13,7 +13,7 @@
 
 #include <maxscale/alloc.h>
 #include <stdlib.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /**
  * @brief Allocates memory; behaves exactly like `malloc`.

server/core/buffer.cc

@@ -22,7 +22,7 @@
 #include <maxscale/debug.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/hint.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/utils.h>
 
 #if defined(BUFFER_TRACE)

server/core/config.cc

@@ -47,7 +47,7 @@
 #include <maxscale/http.hh>
 #include <maxscale/json_api.h>
 #include <maxscale/limits.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/paths.h>
 #include <maxscale/pcre2.h>

server/core/dcb.cc

@@ -44,7 +44,7 @@
 #include <maxscale/clock.h>
 #include <maxscale/limits.h>
 #include <maxscale/listener.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/platform.h>
 #include <maxscale/poll.h>
 #include <maxscale/router.h>

server/core/externcmd.cc

@@ -23,7 +23,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/pcre2.h>
 
 /**

server/core/filter.cc

@@ -31,7 +31,7 @@
 #include <vector>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/session.h>
 #include <maxscale/service.h>

server/core/gateway.cc

@@ -44,7 +44,7 @@
 #include <maxscale/adminusers.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/messagequeue.hh>
 #include <maxscale/mysql_utils.h>

server/core/listener.cc

@@ -38,7 +38,7 @@
 #include <maxscale/ssl.h>
 #include <maxscale/platform.h>
 #include <maxscale/protocol.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/alloc.h>
 #include <maxscale/users.h>
 #include <maxscale/service.h>

server/core/load_utils.cc

@@ -25,7 +25,7 @@
 #include <string>
 
 #include <maxscale/modinfo.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/version.h>
 #include <maxscale/paths.h>
 #include <maxscale/alloc.h>

server/core/log.cc

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 #include <sys/time.h>
 #include <syslog.h>

server/core/maxkeys.c

@@ -27,7 +27,7 @@
 #include <getopt.h>
 #include <stdio.h>
 
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/random.h>
 

server/core/maxpasswd.c

@@ -31,7 +31,7 @@
 #include <getopt.h>
 
 #include <maxscale/paths.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/random.h>
 #include <maxscale/alloc.h>
 

server/core/maxscale_pcre2.cc

@@ -27,7 +27,7 @@
 #include <maxscale/pcre2.h>
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /**
  * Utility wrapper for PCRE2 library function call pcre2_substitute.

server/core/messagequeue.cc

@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <fstream>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include "internal/routingworker.hh"
 
 namespace

server/core/monitor.cc

@@ -30,7 +30,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/json_api.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/mariadb.hh>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/paths.h>

server/core/mysql_binlog.cc

@@ -18,7 +18,7 @@
 #include <maxscale/mysql_binlog.h>
 #include <maxscale/mysql_utils.h>
 #include <stdlib.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <string.h>
 #include <maxscale/debug.h>
 #include <maxscale/users.h>

server/core/mysql_utils.cc

@@ -30,7 +30,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 namespace
 {

server/core/query_classifier.cc

@@ -21,7 +21,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/json_api.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/pcre2.h>
 #include <maxscale/platform.h>

server/core/secrets.cc

@@ -19,7 +19,7 @@
 #include <time.h>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/random.h>

server/core/server.cc

@@ -35,7 +35,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/poll.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/ssl.h>
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>

server/core/service.cc

@@ -40,7 +40,7 @@
 #include <maxscale/paths.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/listener.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/poll.h>
 #include <maxscale/protocol.h>
 #include <maxscale/resultset.hh>

server/core/session.cc

@@ -31,7 +31,7 @@
 #include <maxscale/clock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/poll.h>
 #include <maxscale/router.h>
 #include <maxscale/service.h>

server/core/ssl.cc

@@ -31,7 +31,7 @@
 #include <stdbool.h>
 #include <sys/ioctl.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/poll.h>
 #include <maxscale/service.h>
 

server/core/test/test_config.cc

@@ -17,7 +17,7 @@
 #endif
 
 #include <iostream>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include "../config.cc"
 
 using namespace std;

server/core/test/test_event.cc

@@ -21,7 +21,7 @@
 #include <iostream>
 #include <sstream>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 using namespace maxscale;
 using namespace std;

server/core/test/test_log.cc

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <time.h>
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/debug.h>
 
 static void skygw_log_enable(int priority)

server/core/test/test_logorder.cc

@@ -18,7 +18,7 @@
 #include <time.h>
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 static void skygw_log_enable(int priority)
 {

server/core/test/test_logthrottling.cc

@@ -20,7 +20,7 @@
 #include <pthread.h>
 #include <sched.h>
 #include <semaphore.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/random.h>
 
 using std::cerr;

server/core/test/test_server.cc

@@ -35,7 +35,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/server.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/config.hh>
 

server/core/test/test_users.cc

@@ -34,7 +34,7 @@
 #include <string.h>
 
 #include <maxscale/users.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 static int test1()
 {

server/core/test/test_utils.h

@@ -18,7 +18,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/maxscale_test.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/config.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/paths.h>

server/core/users.cc

@@ -21,7 +21,7 @@
 #include <maxscale/users.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/spinlock.hh>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/jansson.hh>
 
 namespace

server/core/utils.cc

@@ -44,7 +44,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/limits.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/poll.h>

server/core/worker.cc

@@ -23,7 +23,7 @@
 #include <sys/timerfd.h>
 
 #include <maxbase/atomic.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/semaphore.hh>
 
 #define WORKER_ABSENT_ID -1

server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc

@@ -18,7 +18,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/secrets.h>

server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc

@@ -16,7 +16,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/server.h>
 

server/modules/authenticator/GSSAPI/gssapi_auth_common.cc

@@ -13,7 +13,7 @@
 
 #include "gssapi_auth.h"
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /**
  * @brief Report GSSAPI errors

server/modules/authenticator/MySQLAuth/dbusers.cc

@@ -23,7 +23,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>

server/modules/authenticator/PAM/PAMAuth/pam_instance.cc

@@ -16,7 +16,7 @@
 #include <string>
 #include <string.h>
 #include <maxscale/jansson.hh>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/secrets.h>
 #include <maxscale/mysql_utils.h>
 

server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc

@@ -14,7 +14,7 @@
 #include "pam_backend_auth.hh"
 
 #include <maxscale/authenticator.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/server.h>
 #include "pam_backend_session.hh"
 #include "../pam_auth_common.hh"

server/modules/filter/cache/storagefactory.cc

@@ -18,7 +18,7 @@
 #include <new>
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include "cachefilter.h"
 #include "lrustoragest.hh"
 #include "lrustoragemt.hh"

server/modules/filter/cache/test/testkeygeneration.cc

@@ -18,7 +18,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include "storagefactory.hh"
 #include "cache.hh"
 #include "cache_storage_api.hh"

server/modules/filter/cache/test/testrules.cc

@@ -16,7 +16,7 @@
 #include <iostream>
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>

server/modules/filter/cache/test/teststorage.cc

@@ -17,7 +17,7 @@
 #include <iostream>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/utils.h>

server/modules/filter/ccrfilter/ccrfilter.cc

@@ -20,7 +20,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/filter.h>
 #include <maxscale/hint.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/pcre2.h>

server/modules/filter/dbfwfilter/dbfwfilter.cc

@@ -72,7 +72,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/modutil.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/platform.h>
 #include <maxscale/pcre2.h>

server/modules/filter/dbfwfilter/ruleparser.y

@@ -20,7 +20,7 @@
 %{
 #include <lex.yy.h>
 #include "dbfwfilter.h"
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 %}
 
 /** We need a reentrant scanner so no global variables are used */

server/modules/filter/dbfwfilter/rules.cc

@@ -17,7 +17,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modutil.h>
 #include <maxscale/protocol/mysql.h>
 

server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc

@@ -14,7 +14,7 @@
 #include <cstdlib>
 #include <memory>
 #include <iostream>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/filtermodule.hh>
 #include <maxscale/queryclassifiermodule.hh>
 #include <maxscale/mock/backend.hh>

server/modules/filter/dbfwfilter/token.l

@@ -13,7 +13,7 @@
 
 %{
 #include <ruleparser.yy.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 %}
 
 %option reentrant noyywrap bison-bridge prefix="dbfw_yy"

server/modules/filter/hintfilter/hintparser.cc

@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/filter.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>

server/modules/filter/insertstream/insertstream.cc

@@ -19,7 +19,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
 #include <maxscale/filter.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/poll.h>

server/modules/filter/luafilter/luafilter.cc

@@ -46,7 +46,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
 #include <maxscale/filter.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modutil.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/session.h>

server/modules/filter/maxrows/maxrows.cc

@@ -26,7 +26,7 @@
 #include <maxscale/buffer.h>
 #include <maxscale/debug.h>
 #include <maxscale/filter.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/mysql_utils.h>

server/modules/filter/mqfilter/mqfilter.cc

@@ -73,7 +73,7 @@
 #include <amqp_tcp_socket.h>
 #include <amqp_ssl_socket.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/session.h>

server/modules/filter/namedserverfilter/namedserverfilter.cc

@@ -39,7 +39,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/hint.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/server.h>

server/modules/filter/qlafilter/qlafilter.cc

@@ -40,7 +40,7 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/filter.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/pcre2.h>

server/modules/filter/regexfilter/regexfilter.cc

@@ -20,7 +20,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/filter.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/pcre2.h>

server/modules/filter/tee/tee.cc

@@ -21,7 +21,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modulecmd.h>
 
 #include "tee.hh"

server/modules/filter/topfilter/topfilter.cc

@@ -39,7 +39,7 @@
 #include <maxscale/filter.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>

server/modules/filter/tpmfilter/tpmfilter.cc

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

server/modules/monitor/galeramon/galeramon.cc

@@ -26,7 +26,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/secrets.h>

server/modules/monitor/mmmon/mmmon.cc

@@ -27,7 +27,7 @@
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/secrets.h>

server/modules/protocol/CDC/cdc.cc

@@ -35,7 +35,7 @@
 #include <cdc.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.h>

server/modules/protocol/HTTPD/httpd.cc

@@ -39,7 +39,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/protocol.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/resultset.hh>
 
 #define ISspace(x) isspace((int)(x))

server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc

@@ -15,7 +15,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/limits.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/poll.h>

server/modules/protocol/MySQL/mariadbclient/mysql_client.cc

@@ -25,7 +25,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/poll.h>

server/modules/protocol/MySQL/mysql_common.cc

@@ -23,7 +23,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/clock.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modutil.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/protocol/mysql.h>

server/modules/protocol/maxscaled/maxscaled.cc

@@ -34,7 +34,7 @@
 #include <maxscale/poll.h>
 #include <maxbase/atomic.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 #include "maxscaled.h"
 #include <maxscale/maxadmin.h>

server/modules/protocol/telnetd/telnetd.cc

@@ -33,7 +33,7 @@
 #include <maxbase/atomic.h>
 #include <telnetd.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modinfo.h>
 
 /**

server/modules/routing/avrorouter/avro.cc

@@ -31,7 +31,7 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>

server/modules/routing/avrorouter/avro_client.cc

@@ -31,7 +31,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/version.h>
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.hh>

server/modules/routing/avrorouter/avro_converter.cc

@@ -17,7 +17,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /**
  * @brief Allocate an Avro table

server/modules/routing/avrorouter/avro_file.cc

@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 
 #include <maxscale/alloc.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/utils.h>
 

server/modules/routing/avrorouter/avro_main.cc

@@ -26,7 +26,7 @@
 #include <maxscale/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.h>

server/modules/routing/avrorouter/avro_schema.cc

@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <limits.h>
 #include <unistd.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <maxscale/debug.h>

server/modules/routing/binlogrouter/binlog_common.cc

@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <binlog_common.h>
 #include <blr_constants.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 /**
  * @file binlog_common.c - Common binary log code shared between multiple modules

server/modules/routing/binlogrouter/blr.cc

@@ -41,7 +41,7 @@
 #include <maxscale/config.hh>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/router.h>
 #include <maxscale/secrets.h>

server/modules/routing/binlogrouter/blr_cache.cc

@@ -37,7 +37,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 
 
 /**

server/modules/routing/binlogrouter/blr_file.cc

@@ -32,7 +32,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
 #include <maxscale/encryption.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/router.h>
 #include <maxscale/secrets.h>

server/modules/routing/binlogrouter/blr_master.cc

@@ -43,7 +43,7 @@
 #include <maxscale/buffer.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/router.h>
 #include <maxscale/routingworker.h>

server/modules/routing/binlogrouter/blr_slave.cc

@@ -38,7 +38,7 @@
 #include <maxscale/clock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
-#include <maxscale/log_manager.h>
+#include <maxscale/log.h>
 #include <maxscale/maxscale.h>
 #include <maxscale/poll.h>
 #include <maxscale/router.h>