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>

diff --git a/ctdb/server/ctdb_banning.c b/ctdb/server/ctdb_banning.c
index d43e89c26ef0491747683e494f4b6c77e64eb323..92bc5100d79370d918a74de25bb26e6584d7d165 100644 (file)
--- a/ctdb/server/ctdb_banning.c
+++ b/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,

diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index 7b479d6f406a40dd95a45437bd4945133bb4e0a1..6d05af8564966bd6b0111b24ec299a453025c108 100644 (file)
--- a/ctdb/server/ctdb_call.c
+++ b/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;

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 6d1265312b8f061b7c4c4686a91b33455e987aad..e6f8a0d2fb79bd792749fa408bcb782e87d3256b 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/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 {

diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 4abec4e1c0d023ef8c79197149caef9e53945001..36dcfad859021425dc60a3ffd9527eb4209f58f8 100644 (file)
--- a/ctdb/server/ctdb_daemon.c
+++ b/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;

diff --git a/ctdb/server/ctdb_fork.c b/ctdb/server/ctdb_fork.c
index 46b0a13a7d99f144d3b7422f945982ad582169ba..661e72c6c2714bf2e008831b579e124d34f9745a 100644 (file)
--- a/ctdb/server/ctdb_fork.c
+++ b/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, ...)
 {

diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c
index 8aa0f9fb1f4235d2d626942147495b322e84c3ca..1dd05e23ba0697efa4e189c0e850f9dffa22b1bc 100644 (file)
--- a/ctdb/server/ctdb_freeze.c
+++ b/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

diff --git a/ctdb/server/ctdb_keepalive.c b/ctdb/server/ctdb_keepalive.c
index 05aa77ec9a22580293d96b3a950d772f0c4fe008..a8acded6946262ab4a807a1899308a627af3ec1f 100644 (file)
--- a/ctdb/server/ctdb_keepalive.c
+++ b/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"
 
 
 /*

diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c
index 0579e883a558b0c6ada5ed997e934f1db741815f..78ba35c78a6d90f60bfec6eb232f081065ab6de0 100644 (file)
--- a/ctdb/server/ctdb_lock.c
+++ b/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

diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c
index 09fc80b2d5bb1f64a86d8106a41c11b91a883620..29b1982e28af8b0874702820213ce6ce494c9855 100644 (file)
--- a/ctdb/server/ctdb_logging.c
+++ b/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 = "";
 

diff --git a/ctdb/server/ctdb_logging_file.c b/ctdb/server/ctdb_logging_file.c
index e1586e1e2429609acc4a039741ffbed8f1f9c678..488de263a8011781e501af6a1c4def7d2c442d1e 100644 (file)
--- a/ctdb/server/ctdb_logging_file.c
+++ b/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"
 

diff --git a/ctdb/server/ctdb_logging_syslog.c b/ctdb/server/ctdb_logging_syslog.c
index c1ba1f4f0961b25b9fab96fe9b21eb20b10c6ba7..54643e23277045b78c1a03a528fe8169bbb7d213 100644 (file)
--- a/ctdb/server/ctdb_logging_syslog.c
+++ b/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... */

diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index c5c60e9d31f32cc969f241832d5b3b5ec19b51ef..8724791349e4d4459671df0a9876c0d0fbb5ac32 100644 (file)
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/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"
 

diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c
index 1420b5256f3e753de6e65c58763f139b0bee4600..44cc54739de97de8dbc02cadd6542bc77adf86c3 100644 (file)
--- a/ctdb/server/ctdb_monitor.c
+++ b/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;

diff --git a/ctdb/server/ctdb_persistent.c b/ctdb/server/ctdb_persistent.c
index 10e68351042993d1ea428c99174a109532f0ece7..1811ae8fa66a1cbcaf48f26aad26f6a0044a77be 100644 (file)
--- a/ctdb/server/ctdb_persistent.c
+++ b/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;

diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index f438951404e1114421210c0b00cddaca83d484f1..bf045c1461d7de8af92717a1ea7aeaa25d1421e5 100644 (file)
--- a/ctdb/server/ctdb_recover.c
+++ b/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)

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index be419fbf156ef69bfe92163296b6a44347decaa0..13f833fd74a7766310df0eee96f696df1c63072d 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/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 */

diff --git a/ctdb/server/ctdb_server.c b/ctdb/server/ctdb_server.c
index 521f553b11ca2e96b78c0508390d83278e52a202..b30ecaa191501d151abb3b60b753e4922bb0473f 100644 (file)
--- a/ctdb/server/ctdb_server.c
+++ b/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

diff --git a/ctdb/server/ctdb_serverids.c b/ctdb/server/ctdb_serverids.c
index b209d3616cd1353aeec6db398ae47b6a2a6bea9a..11ee99b5aad392db82f6b1ff466c8b047cd50ae0 100644 (file)
--- a/ctdb/server/ctdb_serverids.c
+++ b/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

diff --git a/ctdb/server/ctdb_statistics.c b/ctdb/server/ctdb_statistics.c
index 623cb0accc26afe3d885f3b90de75ee79f49b74b..4cf8f9e2726a1aa51a3634ae0057212c1cd72c1c 100644 (file)
--- a/ctdb/server/ctdb_statistics.c
+++ b/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,

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index d21125a8696b961832d0785fb27abe3ef00c31be..813e364f2aca7dc4a7b68aac4e2eb4ca91ebeca1 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/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)

diff --git a/ctdb/server/ctdb_traverse.c b/ctdb/server/ctdb_traverse.c
index e4287f907936b4aa2d6adce43c46d5085d8c162e..3dea3fad7c68b48223c01410121ca4f44cf908e7 100644 (file)
--- a/ctdb/server/ctdb_traverse.c
+++ b/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);
 

diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c
index 29c11ea625441ba3189ae4c8212eabea12693d31..8622b33b2b8759624a3251585a903eadccb9b0c9 100644 (file)
--- a/ctdb/server/ctdb_tunables.c
+++ b/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;

diff --git a/ctdb/server/ctdb_update_record.c b/ctdb/server/ctdb_update_record.c
index 1ecb089940ed9cb926b3af02177fd3b3e4af8090..143520ab7b15c086e6001703c74f42cf121b1b6a 100644 (file)
--- a/ctdb/server/ctdb_update_record.c
+++ b/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;

diff --git a/ctdb/server/ctdb_uptime.c b/ctdb/server/ctdb_uptime.c
index 3e028e8a4e1e86acdf615f26e06d95059e043aa5..53025f5de68f993da629ca3f337a79226196c700 100644 (file)
--- a/ctdb/server/ctdb_uptime.c
+++ b/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

diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index a95671e375a8eebb671e55289e9f7e78e952bfcc..a81bd54b287cfc8c442944d796c195d4c49e678d 100644 (file)
--- a/ctdb/server/ctdb_vacuum.c
+++ b/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)
 

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index d2d4f0a79b11b3d0dcdcad184b3e2dff36360259..b8b979d922b49768038bae419647eb749f00b31c 100644 (file)
--- a/ctdb/server/ctdbd.c
+++ b/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;

diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 41acd0754e2cb96d538907edc7da4506c68a7546..c6e31282ab265a7e6018a1e966754a9296cad614 100644 (file)
--- a/ctdb/server/eventscript.c
+++ b/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,