summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ctdb/common/cmdline.c8
-rw-r--r--ctdb/common/ctdb_logging.c2
-rw-r--r--ctdb/ib/ibwrapper_test.c6
-rw-r--r--ctdb/include/ctdb_logging.h8
-rw-r--r--ctdb/server/ctdb_control.c6
-rw-r--r--ctdb/server/ctdb_logging.c4
-rw-r--r--ctdb/server/ctdb_recoverd.c2
-rw-r--r--ctdb/tests/scripts/unit.sh2
-rw-r--r--ctdb/tests/src/ctdb_functest.c4
-rw-r--r--ctdb/tests/src/ctdb_porting_tests.c2
-rw-r--r--ctdb/tests/src/ctdb_takeover_tests.c4
11 files changed, 24 insertions, 24 deletions
diff --git a/ctdb/common/cmdline.c b/ctdb/common/cmdline.c
index ebe68e4977..ab2b45e914 100644
--- a/ctdb/common/cmdline.c
+++ b/ctdb/common/cmdline.c
@@ -97,9 +97,9 @@ struct ctdb_context *ctdb_cmdline_init(struct event_context *ev)
/* Set the debug level */
if (isalpha(ctdb_cmdline.debuglevel[0]) || ctdb_cmdline.debuglevel[0] == '-') {
- LogLevel = get_debug_by_desc(ctdb_cmdline.debuglevel);
+ DEBUGLEVEL = get_debug_by_desc(ctdb_cmdline.debuglevel);
} else {
- LogLevel = strtol(ctdb_cmdline.debuglevel, NULL, 0);
+ DEBUGLEVEL = strtol(ctdb_cmdline.debuglevel, NULL, 0);
}
/* set up the tree to store server ids */
@@ -148,9 +148,9 @@ struct ctdb_context *ctdb_cmdline_client(struct tevent_context *ev,
/* Set the debug level */
if (isalpha(ctdb_cmdline.debuglevel[0]) || ctdb_cmdline.debuglevel[0] == '-') {
- LogLevel = get_debug_by_desc(ctdb_cmdline.debuglevel);
+ DEBUGLEVEL = get_debug_by_desc(ctdb_cmdline.debuglevel);
} else {
- LogLevel = strtol(ctdb_cmdline.debuglevel, NULL, 0);
+ DEBUGLEVEL = strtol(ctdb_cmdline.debuglevel, NULL, 0);
}
ret = ctdb_socket_connect(ctdb);
diff --git a/ctdb/common/ctdb_logging.c b/ctdb/common/ctdb_logging.c
index 1490eef580..bf67f096b5 100644
--- a/ctdb/common/ctdb_logging.c
+++ b/ctdb/common/ctdb_logging.c
@@ -23,7 +23,7 @@
#include "../include/ctdb_private.h"
#include "../include/ctdb_client.h"
-int LogLevel = DEBUG_NOTICE;
+int DEBUGLEVEL = DEBUG_NOTICE;
int this_log_level = 0;
const char *debug_extra = "";
diff --git a/ctdb/ib/ibwrapper_test.c b/ctdb/ib/ibwrapper_test.c
index 48162c328a..397fdf1af7 100644
--- a/ctdb/ib/ibwrapper_test.c
+++ b/ctdb/ib/ibwrapper_test.c
@@ -537,7 +537,7 @@ void ibwtest_usage(struct ibwtest_ctx *tcx, char *name)
printf("\t-n number of messages to send [default %d]\n", tcx->nmsg);
printf("\t-l usec time to sleep in the main loop [default %d]\n", tcx->sleep_usec);
printf("\t-v max variable msg size in bytes [default %d], 0=don't send var. size\n", tcx->maxsize);
- printf("\t-d LogLevel [default %d]\n", LogLevel);
+ printf("\t-d LogLevel [default %d]\n", DEBUGLEVEL);
printf("Press ctrl+C to stop the program.\n");
}
@@ -553,7 +553,7 @@ int main(int argc, char *argv[])
memset(tcx, 0, sizeof(struct ibwtest_ctx));
tcx->nsec = 0;
tcx->nmsg = 1000;
- LogLevel = 0;
+ DEBUGLEVEL = 0;
/* here is the only case we can't avoid using global... */
testctx = tcx;
@@ -592,7 +592,7 @@ int main(int argc, char *argv[])
tcx->maxsize = (unsigned int)atoi(optarg);
break;
case 'd':
- LogLevel = atoi(optarg);
+ DEBUGLEVEL = atoi(optarg);
break;
default:
fprintf(stderr, "ERROR: unknown option -%c\n", (char)op);
diff --git a/ctdb/include/ctdb_logging.h b/ctdb/include/ctdb_logging.h
index 41bbed5964..f6f904aead 100644
--- a/ctdb/include/ctdb_logging.h
+++ b/ctdb/include/ctdb_logging.h
@@ -20,7 +20,7 @@
#ifndef _CTDB_LOGGING_H_
#define _CTDB_LOGGING_H_
-extern int LogLevel;
+extern int DEBUGLEVEL;
extern int this_log_level;
extern const char *debug_extra;
@@ -35,8 +35,8 @@ enum debug_level {
DEBUG_DEBUG = 4,
};
-#define DEBUGLVL(lvl) ((lvl) <= LogLevel)
-#define DEBUG(lvl, x) do { this_log_level = (lvl); if ((lvl) <= LogLevel) { do_debug x; }} while (0)
-#define DEBUGADD(lvl, x) do { if ((lvl) <= LogLevel) { this_log_level = (lvl); do_debug_add x; }} while (0)
+#define DEBUGLVL(lvl) ((lvl) <= DEBUGLEVEL)
+#define DEBUG(lvl, x) do { this_log_level = (lvl); if ((lvl) <= DEBUGLEVEL) { do_debug x; }} while (0)
+#define DEBUGADD(lvl, x) do { if ((lvl) <= DEBUGLEVEL) { this_log_level = (lvl); do_debug_add x; }} while (0)
#endif /* _CTDB_LOGGING_H_ */
diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 98972cac80..49bc9863a9 100644
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -108,14 +108,14 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
case CTDB_CONTROL_SET_DEBUG: {
CHECK_CONTROL_DATA_SIZE(sizeof(int32_t));
- LogLevel = *(int32_t *)indata.dptr;
+ DEBUGLEVEL = *(int32_t *)indata.dptr;
return 0;
}
case CTDB_CONTROL_GET_DEBUG: {
CHECK_CONTROL_DATA_SIZE(0);
- outdata->dptr = (uint8_t *)&LogLevel;
- outdata->dsize = sizeof(LogLevel);
+ outdata->dptr = (uint8_t *)&(DEBUGLEVEL);
+ outdata->dsize = sizeof(DEBUGLEVEL);
return 0;
}
diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c
index f46b3bb5d4..97cc3beda6 100644
--- a/ctdb/server/ctdb_logging.c
+++ b/ctdb/server/ctdb_logging.c
@@ -397,7 +397,7 @@ int ctdb_set_logfile(struct ctdb_context *ctdb, const char *logfile, bool use_sy
static void write_to_log(struct ctdb_log_state *log,
const char *buf, unsigned int len)
{
- if (script_log_level <= LogLevel) {
+ if (script_log_level <= DEBUGLEVEL) {
if (log != NULL && log->prefix != NULL) {
do_debug("%s: %*.*s\n", log->prefix, len, len, buf);
} else {
@@ -628,7 +628,7 @@ static void ctdb_tevent_logging(void *private_data,
break;
}
- if (lvl <= LogLevel) {
+ if (lvl <= DEBUGLEVEL) {
this_log_level = lvl;
do_debug_v(fmt, ap);
}
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index b817668771..fd07e64e23 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -3553,7 +3553,7 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
DEBUG(DEBUG_ERR, (__location__ " Failed to read debuglevel from parent\n"));
return;
}
- LogLevel = debug_level;
+ DEBUGLEVEL = debug_level;
/* get relevant tunables */
ret = ctdb_ctrl_get_all_tunables(ctdb, CONTROL_TIMEOUT(), CTDB_CURRENT_NODE, &ctdb->tunable);
diff --git a/ctdb/tests/scripts/unit.sh b/ctdb/tests/scripts/unit.sh
index 4eccada48d..38b7e21c8c 100644
--- a/ctdb/tests/scripts/unit.sh
+++ b/ctdb/tests/scripts/unit.sh
@@ -124,7 +124,7 @@ result_filter_default ()
_date_time_pid='[0-9/][0-9/]*\ [0-9:\.][0-9:\.]*\ \[[\ 0-9][\ 0-9]*\]'
sed -e "s@^${_date_time_pid}:@DATE\ TIME\ \[PID\]:@"
}
-TEST_DATE_STAMP="DATE TIME [PID]: "
+TEST_DATE_STAMP=""
# Override this function to customise output filtering.
result_filter ()
diff --git a/ctdb/tests/src/ctdb_functest.c b/ctdb/tests/src/ctdb_functest.c
index 16ca4fddd6..9eaae55765 100644
--- a/ctdb/tests/src/ctdb_functest.c
+++ b/ctdb/tests/src/ctdb_functest.c
@@ -162,9 +162,9 @@ static void usage(void)
int main(int argc, const char *argv[])
{
- LogLevel = DEBUG_DEBUG;
+ DEBUGLEVEL = DEBUG_DEBUG;
if (getenv("CTDB_TEST_LOGLEVEL")) {
- LogLevel = atoi(getenv("CTDB_TEST_LOGLEVEL"));
+ DEBUGLEVEL = atoi(getenv("CTDB_TEST_LOGLEVEL"));
}
if (argc < 2) {
diff --git a/ctdb/tests/src/ctdb_porting_tests.c b/ctdb/tests/src/ctdb_porting_tests.c
index bd78361086..e95c25d978 100644
--- a/ctdb/tests/src/ctdb_porting_tests.c
+++ b/ctdb/tests/src/ctdb_porting_tests.c
@@ -264,7 +264,7 @@ int main(int argc, const char *argv[])
int extra_argc = 0;
poptContext pc;
- LogLevel = DEBUG_INFO;
+ DEBUGLEVEL = DEBUG_INFO;
pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST);
diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c
index 04b49e879b..8b07325d04 100644
--- a/ctdb/tests/src/ctdb_takeover_tests.c
+++ b/ctdb/tests/src/ctdb_takeover_tests.c
@@ -598,9 +598,9 @@ static void usage(void)
int main(int argc, const char *argv[])
{
- LogLevel = DEBUG_DEBUG;
+ DEBUGLEVEL = DEBUG_DEBUG;
if (getenv("CTDB_TEST_LOGLEVEL")) {
- LogLevel = atoi(getenv("CTDB_TEST_LOGLEVEL"));
+ DEBUGLEVEL = atoi(getenv("CTDB_TEST_LOGLEVEL"));
}
if (argc < 2) {
generated by cgit (git 2.34.1) at 2024-06-08 20:23:32 +0000