diff options
27 files changed, 28 insertions, 27 deletions
diff --git a/ctdb/server/ctdb_banning.c b/ctdb/server/ctdb_banning.c index d43e89c26ef..92bc5100d79 100644 --- 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 7b479d6f406..6d05af85649 100644 --- 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 6d1265312b8..e6f8a0d2fb7 100644 --- 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 4abec4e1c0d..36dcfad8590 100644 --- 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 46b0a13a7d9..661e72c6c27 100644 --- 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 8aa0f9fb1f4..1dd05e23ba0 100644 --- 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 05aa77ec9a2..a8acded6946 100644 --- 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 0579e883a55..78ba35c78a6 100644 --- 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 09fc80b2d5b..29b1982e28a 100644 --- 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 e1586e1e242..488de263a80 100644 --- 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 c1ba1f4f096..54643e23277 100644 --- 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 c5c60e9d31f..8724791349e 100644 --- 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 1420b5256f3..44cc54739de 100644 --- 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 10e68351042..1811ae8fa66 100644 --- 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 f438951404e..bf045c1461d 100644 --- 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 be419fbf156..13f833fd74a 100644 --- 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 521f553b11c..b30ecaa1915 100644 --- 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 b209d3616cd..11ee99b5aad 100644 --- 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 623cb0accc2..4cf8f9e2726 100644 --- 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 d21125a8696..813e364f2ac 100644 --- 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 e4287f90793..3dea3fad7c6 100644 --- 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 29c11ea6254..8622b33b2b8 100644 --- 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 1ecb089940e..143520ab7b1 100644 --- 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 3e028e8a4e1..53025f5de68 100644 --- 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 a95671e375a..a81bd54b287 100644 --- 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 d2d4f0a79b1..b8b979d922b 100644 --- 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 41acd0754e2..c6e31282ab2 100644 --- 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, |