From c170cdbc75c86af6b4c566966b60f172d677c8a6 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Wed, 11 Nov 2015 14:31:41 +1100 Subject: [PATCH] ctdb-logging: Move debug_extra definition to server/ctdb_logging.c This variable is used for adding a prefix to log entries from various child processes. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke Reviewed-by: Michael Adam --- ctdb/common/ctdb_logging.c | 2 -- ctdb/include/ctdb_logging.h | 2 -- ctdb/include/ctdb_private.h | 2 ++ ctdb/server/ctdb_logging.c | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ctdb/common/ctdb_logging.c b/ctdb/common/ctdb_logging.c index e76966c822c..4f0bbedd4e8 100644 --- a/ctdb/common/ctdb_logging.c +++ b/ctdb/common/ctdb_logging.c @@ -21,8 +21,6 @@ #include "replace.h" #include "ctdb_logging.h" -const char *debug_extra = ""; - struct debug_levels { int32_t level; const char *description; diff --git a/ctdb/include/ctdb_logging.h b/ctdb/include/ctdb_logging.h index a8bc4d0ef80..819bc71f5f0 100644 --- a/ctdb/include/ctdb_logging.h +++ b/ctdb/include/ctdb_logging.h @@ -25,8 +25,6 @@ #include #include -extern const char *debug_extra; - enum debug_level { DEBUG_ERR = 0, DEBUG_WARNING = 1, diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 253b67dc67b..2542c4a82d7 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -741,6 +741,8 @@ struct lock_request *ctdb_lock_alldb(TALLOC_CTX *mem_ctx, /* from ctdb_logging.c */ +extern const char *debug_extra; + typedef int (*ctdb_log_setup_fn_t)(TALLOC_CTX *mem_ctx, const char *logging, const char *app_name); diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c index ba2cf836ffa..09fc80b2d5b 100644 --- a/ctdb/server/ctdb_logging.c +++ b/ctdb/server/ctdb_logging.c @@ -36,6 +36,8 @@ #include "common/system.h" #include "common/common.h" +const char *debug_extra = ""; + struct ctdb_log_backend { struct ctdb_log_backend *prev, *next; const char *prefix; -- 2.34.1