ctdb-server: Replace ctdb_logging.h with common/logging.h

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>

ctdb/server/ctdb_banning.c

@@ -30,9 +30,9 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/common.h"
+#include "common/logging.h"
 
 static void ctdb_ban_node_event(struct tevent_context *ev,
 				struct tevent_timer *te,

ctdb/server/ctdb_call.c

@@ -33,12 +33,12 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/rb_tree.h"
 #include "common/reqid.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 struct ctdb_sticky_record {
 	struct ctdb_context *ctdb;

ctdb/server/ctdb_control.c

@@ -32,10 +32,10 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/reqid.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 
 struct ctdb_control_state {

ctdb/server/ctdb_daemon.c

@@ -37,12 +37,12 @@
 #include "ctdb_version.h"
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/rb_tree.h"
 #include "common/reqid.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 struct ctdb_client_pid_list {
 	struct ctdb_client_pid_list *next, *prev;

ctdb/server/ctdb_fork.c

@@ -26,13 +26,13 @@
 
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 #include "ctdb_client.h"
 
 #include "common/rb_tree.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 void ctdb_set_child_info(TALLOC_CTX *mem_ctx, const char *child_name_fmt, ...)
 {

ctdb/server/ctdb_freeze.c

@@ -29,10 +29,10 @@
 #include "lib/util/debug.h"
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
 
 #include "common/rb_tree.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 /**
  * Cancel a transaction on database

ctdb/server/ctdb_keepalive.c

@@ -31,9 +31,9 @@
 #include "lib/util/samba_util.h"
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
 
 #include "common/common.h"
+#include "common/logging.h"
 
 
 /*

ctdb/server/ctdb_lock.c

@@ -30,10 +30,10 @@
 #include "lib/util/samba_util.h"
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
 
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 /*
  * Non-blocking Locking API

ctdb/server/ctdb_logging.c

@@ -31,10 +31,10 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 const char *debug_extra = "";
 

ctdb/server/ctdb_logging_file.c

@@ -29,7 +29,6 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/system.h"
 

ctdb/server/ctdb_logging_syslog.c

@@ -28,7 +28,8 @@
 #include "lib/util/samba_util.h" /* get_myname */
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
+
+#include "common/logging.h"
 
 /* Linux and FreeBSD define this appropriately - try good old /dev/log
  * for anything that doesn't... */

ctdb/server/ctdb_ltdb_server.c

@@ -34,12 +34,12 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/rb_tree.h"
 #include "common/reqid.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 #define PERSISTENT_HEALTH_TDB "persistent_health.tdb"
 

ctdb/server/ctdb_monitor.c

@@ -30,10 +30,10 @@
 #include "lib/util/samba_util.h"
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
 
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 struct ctdb_monitor_state {
 	uint32_t monitoring_mode;

ctdb/server/ctdb_persistent.c

@@ -32,10 +32,10 @@
 #include "lib/util/samba_util.h"
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
 
 #include "common/reqid.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 struct ctdb_persistent_state {
 	struct ctdb_context *ctdb;

ctdb/server/ctdb_recover.c

@@ -34,10 +34,10 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 int 
 ctdb_control_getvnnmap(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA indata, TDB_DATA *outdata)

ctdb/server/ctdb_recoverd.c

@@ -35,11 +35,11 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/system.h"
 #include "common/cmdline.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 
 /* List of SRVID requests that need to be processed */

ctdb/server/ctdb_server.c

@@ -30,9 +30,9 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/common.h"
+#include "common/logging.h"
 
 /*
   choose the transport we will use

ctdb/server/ctdb_serverids.c

@@ -24,11 +24,11 @@
 #include "lib/util/debug.h"
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
 
 #include "common/rb_tree.h"
 #include "common/reqid.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 
 #define SERVER_ID_KEY_SIZE 3

ctdb/server/ctdb_statistics.c

@@ -28,7 +28,8 @@
 #include "lib/util/samba_util.h"
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
+
+#include "common/logging.h"
 
 static void ctdb_statistics_update(struct tevent_context *ev,
 				   struct tevent_timer *te,

ctdb/server/ctdb_takeover.c

@@ -33,12 +33,12 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/rb_tree.h"
 #include "common/reqid.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 
 #define TAKEOVER_TIMEOUT() timeval_current_ofs(ctdb->tunable.takeover_timeout,0)

ctdb/server/ctdb_traverse.c

@@ -33,11 +33,11 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/reqid.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 typedef void (*ctdb_traverse_fn_t)(void *private_data, TDB_DATA key, TDB_DATA data);
 

ctdb/server/ctdb_tunables.c

@@ -25,9 +25,9 @@
 #include "lib/util/debug.h"
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
 
 #include "common/common.h"
+#include "common/logging.h"
 
 static const struct {
 	const char *name;

ctdb/server/ctdb_update_record.c

@@ -31,10 +31,10 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 struct ctdb_persistent_write_state {
 	struct ctdb_db_context *ctdb_db;

ctdb/server/ctdb_uptime.c

@@ -29,9 +29,9 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/common.h"
+#include "common/logging.h"
 
 /* 
    returns the ctdb uptime

ctdb/server/ctdb_vacuum.c

@@ -34,11 +34,11 @@
 
 #include "ctdb_private.h"
 #include "ctdb_client.h"
-#include "ctdb_logging.h"
 
 #include "common/rb_tree.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 #define TIMELIMIT() timeval_current_ofs(10, 0)
 

ctdb/server/ctdbd.c

@@ -33,12 +33,12 @@
 #include "lib/util/samba_util.h"
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
 
 #include "common/reqid.h"
 #include "common/system.h"
 #include "common/cmdline.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 static struct {
 	const char *nlist;

ctdb/server/eventscript.c

@@ -33,11 +33,11 @@
 #include "lib/util/samba_util.h"
 
 #include "ctdb_private.h"
-#include "ctdb_logging.h"
 
 #include "common/rb_tree.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 
 static void ctdb_event_script_timeout(struct tevent_context *ev,