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 <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ctdb/common/ctdb_logging.c b/ctdb/common/ctdb_logging.c
index e76966c822c83a91983bf885dd6b6bac126c4469..4f0bbedd4e8a7de6da2b589f13ae64e4cfcf07d4 100644 (file)
--- 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 a8bc4d0ef805080de0609084310206f7b42f7ace..819bc71f5f0a19b298e796805dc81d810acdc43a 100644 (file)
--- a/ctdb/include/ctdb_logging.h
+++ b/ctdb/include/ctdb_logging.h
@@ -25,8 +25,6 @@
 #include <stdio.h>
 #include <talloc.h>
 
-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 253b67dc67b9333b3617c9a89509d86d81297668..2542c4a82d74ee4f558c67c545dcf5ff355b2645 100644 (file)
--- 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 ba2cf836ffa823e7329dc1cb578b5c19be378c69..09fc80b2d5bb1f64a86d8106a41c11b91a883620 100644 (file)
--- 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;