diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-09-24 17:12:56 +1000 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-10-06 12:34:33 +0200 |
| commit | 3105737c4b38b3cb4f9408cfc82cf8b49bc3fb2e (patch) | |
| tree | 2df6b80e0b718f9dcbbdf9428652aa363855c8ae /ctdb/server | |
| parent | 1c8c0be6f97f74169c0b46be4df2245aa631186a (diff) | |
| download | samba-3105737c4b38b3cb4f9408cfc82cf8b49bc3fb2e.tar.gz samba-3105737c4b38b3cb4f9408cfc82cf8b49bc3fb2e.tar.xz samba-3105737c4b38b3cb4f9408cfc82cf8b49bc3fb2e.zip | |
ctdb-logging: Change LogLevel to DEBUGLEVEL
For compatibility with current Samba debug.[ch].
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_control.c | 6 | ||||
| -rw-r--r-- | ctdb/server/ctdb_logging.c | 4 | ||||
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 2 |
3 files changed, 6 insertions, 6 deletions
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); |