From: Arran Cudbard-Bell Date: Wed, 4 Sep 2019 17:06:41 +0000 (-0400) Subject: One log level global to rule them all... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e466db565471b7b51ecabc2b0a26acff74aa1c88;p=thirdparty%2Ffreeradius-server.git One log level global to rule them all... --- diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c index 7953f949ccd..39714968143 100644 --- a/src/bin/radiusd.c +++ b/src/bin/radiusd.c @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) size_t pool_size = 0; void *pool_page_start = NULL, *pool_page_end = NULL; - bool do_mprotect; + bool do_mprotect; dl_module_loader_t *dl_modules = NULL; /* @@ -257,7 +257,7 @@ int main(int argc, char *argv[]) } #endif - rad_debug_lvl = 0; + fr_debug_lvl = 0; fr_time_start(); /* @@ -369,14 +369,14 @@ int main(int argc, char *argv[]) case 'X': config->spawn_workers = false; config->daemonize = false; - rad_debug_lvl += 2; + fr_debug_lvl += 2; do_stdout: default_log.dst = L_DST_STDOUT; default_log.fd = STDOUT_FILENO; break; case 'x': - rad_debug_lvl++; + fr_debug_lvl++; break; default: @@ -396,7 +396,7 @@ int main(int argc, char *argv[]) if (raddb_dir) main_config_raddb_dir_set(config, raddb_dir); } - fr_debug_lvl = req_debug_lvl = config->debug_level = rad_debug_lvl; + config->debug_level = fr_debug_lvl; /* * Mismatch between the binary and the libraries it depends on. @@ -441,7 +441,7 @@ int main(int argc, char *argv[]) * Better here, so it doesn't matter whether we get passed -xv or -vx. */ if (display_version) { - if (rad_debug_lvl == 0) rad_debug_lvl = 1; + if (fr_debug_lvl == 0) fr_debug_lvl = 1; default_log.dst = L_DST_STDOUT; default_log.fd = STDOUT_FILENO; @@ -450,7 +450,7 @@ int main(int argc, char *argv[]) EXIT_WITH_SUCCESS; } - if (rad_debug_lvl) dependency_version_print(); + if (fr_debug_lvl) dependency_version_print(); /* * Under linux CAP_SYS_PTRACE is usually only available before setuid/setguid, @@ -722,7 +722,7 @@ int main(int argc, char *argv[]) el = main_loop_event_list(); } - sc = fr_schedule_create(NULL, el, &default_log, rad_debug_lvl, + sc = fr_schedule_create(NULL, el, &default_log, fr_debug_lvl, networks, workers, thread_instantiate, config->root_cs); diff --git a/src/bin/radmin.c b/src/bin/radmin.c index 195f2ffcd69..95ba7b4b9bb 100644 --- a/src/bin/radmin.c +++ b/src/bin/radmin.c @@ -501,13 +501,13 @@ static int cmd_set_debug_level(UNUSED FILE *fp, FILE *fp_err, UNUSED void *ctx, return -1; } - rad_debug_lvl = req_debug_lvl = fr_debug_lvl = level; + fr_debug_lvl = level; return 0; } static int cmd_show_debug_level(FILE *fp, UNUSED FILE *fp_err, UNUSED void *ctx, UNUSED fr_cmd_info_t const *info) { - fprintf(fp, "%d\n", rad_debug_lvl); + fprintf(fp, "%d\n", fr_debug_lvl); return 0; } diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c index 697d69dc7c4..b60f9022226 100644 --- a/src/bin/unit_test_attribute.c +++ b/src/bin/unit_test_attribute.c @@ -745,7 +745,7 @@ static void command_add(TALLOC_CTX *ctx, char *input, char *output, size_t outle return; } - if (rad_debug_lvl) command_print(); + if (fr_debug_lvl) command_print(); snprintf(output, outlen, "ok"); fflush(stdout); @@ -1496,7 +1496,6 @@ int main(int argc, char *argv[]) case 'x': fr_debug_lvl++; - rad_debug_lvl = fr_debug_lvl; default_log.dst = L_DST_STDOUT; default_log.fd = STDOUT_FILENO; break; diff --git a/src/bin/unit_test_map.c b/src/bin/unit_test_map.c index a29b800ed2e..660e179079e 100644 --- a/src/bin/unit_test_map.c +++ b/src/bin/unit_test_map.c @@ -172,7 +172,6 @@ int main(int argc, char *argv[]) case 'x': fr_debug_lvl++; - rad_debug_lvl = fr_debug_lvl; break; case 'M': diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c index 02b17b0717c..395989ba945 100644 --- a/src/bin/unit_test_module.c +++ b/src/bin/unit_test_module.c @@ -351,7 +351,7 @@ static REQUEST *request_from_file(TALLOC_CTX *ctx, FILE *fp, fr_event_list_t *el } } /* loop over the VP's we read in */ - if (rad_debug_lvl) { + if (fr_debug_lvl) { for (vp = fr_cursor_init(&cursor, &request->packet->vps); vp; vp = fr_cursor_next(&cursor)) { @@ -405,8 +405,7 @@ static REQUEST *request_from_file(TALLOC_CTX *ctx, FILE *fp, fr_event_list_t *el request->log.dst = talloc_zero(request, log_dst_t); request->log.dst->func = vlog_request; request->log.dst->uctx = &default_log; - - request->log.lvl = rad_debug_lvl; + request->log.lvl = fr_debug_lvl; fr_request_async_bootstrap(request, el); @@ -466,7 +465,7 @@ static bool do_xlats(char const *filename, FILE *fp) request->log.dst->func = vlog_request; request->log.dst->uctx = &default_log; - request->log.lvl = rad_debug_lvl; + request->log.lvl = fr_debug_lvl; output[0] = '\0'; while (fgets(input, sizeof(input), fp) != NULL) { @@ -625,7 +624,7 @@ int main(int argc, char *argv[]) } #endif - rad_debug_lvl = 0; + fr_debug_lvl = 0; fr_time_start(); /* @@ -688,11 +687,11 @@ int main(int argc, char *argv[]) break; case 'X': - rad_debug_lvl += 2; + fr_debug_lvl += 2; break; case 'x': - rad_debug_lvl++; + fr_debug_lvl++; break; default: @@ -723,8 +722,7 @@ int main(int argc, char *argv[]) if (tls_init() < 0) EXIT_WITH_FAILURE; #endif - if (rad_debug_lvl) dependency_version_print(); - fr_debug_lvl = rad_debug_lvl; + if (fr_debug_lvl) dependency_version_print(); /* * Mismatch between the binary and the libraries it depends on diff --git a/src/lib/server/cf_parse.c b/src/lib/server/cf_parse.c index c5d59dc6b41..4497d067625 100644 --- a/src/lib/server/cf_parse.c +++ b/src/lib/server/cf_parse.c @@ -307,7 +307,7 @@ int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, UNUSED void *base, CONF_ITEM /* * Hide secrets when using "radiusd -X". */ - if (secret && (rad_debug_lvl < L_DBG_LVL_3)) { + if (secret && (fr_debug_lvl < L_DBG_LVL_3)) { cf_log_debug(cs, "%.*s%s = <<< secret >>>", PAIR_SPACE(cs), parse_spaces, cf_pair_attr(cp)); } else { cf_log_debug(cs, "%.*s%s = \"%pV\"", PAIR_SPACE(cs), parse_spaces, cf_pair_attr(cp), diff --git a/src/lib/server/log.c b/src/lib/server/log.c index fd2d963a001..a7dea244ac6 100644 --- a/src/lib/server/log.c +++ b/src/lib/server/log.c @@ -43,9 +43,6 @@ RCSID("$Id$") #include #include -fr_log_lvl_t rad_debug_lvl = 0; //!< Global debugging level -fr_log_lvl_t req_debug_lvl = 0; //!< Request debugging level - fr_thread_local_setup(TALLOC_CTX *, fr_vlog_request_pool) /** Syslog facility table @@ -229,35 +226,19 @@ static int log_always(fr_log_t const *log, fr_log_type_t type, return r; } - /** Whether a request specific debug message should be logged * - * @param type of message. * @param lvl of debugging this message should be logged at. * @param request The current request. * @return * - true if message should be logged. * - false if message shouldn't be logged. */ -inline bool log_debug_enabled(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request) +inline bool log_rdebug_enabled(fr_log_lvl_t lvl, REQUEST *request) { if (!request->log.dst) return false; - /* - * It's a debug class message, note this doesn't mean it's a debug type message. - * - * For example it could be a RIDEBUG message, which would be an informational message, - * instead of an RDEBUG message which would be a debug debug message. - * - * There is log function, but the request debug level isn't high enough. - * OR, we're in debug mode, and the global debug level isn't high enough, - * then don't log the message. - */ - if ((type & L_DBG) && - ((lvl <= request->log.lvl) || - ((rad_debug_lvl != 0) && (lvl <= rad_debug_lvl)))) { - return true; - } + if (lvl <= request->log.lvl) return false; return false; } @@ -322,12 +303,12 @@ void vlog_request(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request, filename = log_dst->file; + if (!log_rdebug_enabled(lvl, request)) return; + /* * Debug messages get treated specially. */ if ((type & L_DBG) != 0) { - if (!log_debug_enabled(type, lvl, request)) return; - /* * If we're debugging to a file, then use that. * @@ -737,7 +718,7 @@ void log_request_pair_list(fr_log_lvl_t lvl, REQUEST *request, VALUE_PAIR *vp, c if (!vp || !request || !request->log.dst) return; - if (!log_debug_enabled(L_DBG, lvl, request)) return; + if (!log_rdebug_enabled(lvl, request)) return; RINDENT(); for (vp = fr_cursor_init(&cursor, &vp); @@ -773,7 +754,7 @@ void log_request_proto_pair_list(fr_log_lvl_t lvl, REQUEST *request, VALUE_PAIR if (!vp || !request || !request->log.dst) return; - if (!log_debug_enabled(L_DBG, lvl, request)) return; + if (!log_rdebug_enabled(lvl, request)) return; RINDENT(); for (vp = fr_cursor_init(&cursor, &vp); diff --git a/src/lib/server/log.h b/src/lib/server/log.h index dd879035d61..49351a95a7e 100644 --- a/src/lib/server/log.h +++ b/src/lib/server/log.h @@ -42,9 +42,6 @@ typedef struct log_dst log_dst_t; #include #include -extern fr_log_lvl_t rad_debug_lvl; //!< Global debug level. -extern fr_log_lvl_t req_debug_lvl; //!< Request specific debug level. - /** Logging callback to write log messages to a destination * * This allows the logging destination to be customised on a per request basis. @@ -77,10 +74,9 @@ extern size_t syslog_severity_table_len; extern fr_table_num_sorted_t const log_str2dst[]; extern size_t log_str2dst_len; -#define debug_enabled(_type, _lvl) ((_type & L_DBG) && (_lvl <= rad_debug_lvl)) +#define debug_enabled(_type, _lvl) ((_type & L_DBG) && (_lvl <= fr_debug_lvl)) -bool log_debug_enabled(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request) - CC_HINT(nonnull); +bool log_rdebug_enabled(fr_log_lvl_t lvl, REQUEST *request) CC_HINT(nonnull); void vlog_request(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request, char const *file, int line, @@ -211,7 +207,7 @@ void log_global_free(void); #define DEBUG_ENABLED4 debug_enabled(L_DBG, L_DBG_LVL_4) //!< True if global debug level 1-3 messages are enabled #define DEBUG_ENABLED5 debug_enabled(L_DBG, L_DBG_LVL_MAX) //!< True if global debug level 1-5 messages are enabled -#define _DEBUG_LOG(_type, _lvl, _fmt, ...) if (rad_debug_lvl >= _lvl) _FR_LOG_PREFIX(_type, _fmt, ## __VA_ARGS__) +#define _DEBUG_LOG(_type, _lvl, _fmt, ...) if (fr_debug_lvl >= _lvl) _FR_LOG_PREFIX(_type, _fmt, ## __VA_ARGS__) #define DEBUG(_fmt, ...) _DEBUG_LOG(L_DBG, L_DBG_LVL_1, _fmt, ## __VA_ARGS__) #define DEBUG2(_fmt, ...) _DEBUG_LOG(L_DBG, L_DBG_LVL_2, _fmt, ## __VA_ARGS__) #define DEBUG3(_fmt, ...) _DEBUG_LOG(L_DBG, L_DBG_LVL_3, _fmt, ## __VA_ARGS__) @@ -271,32 +267,32 @@ void log_global_free(void); * * @{ */ -#define RDEBUG_ENABLED log_debug_enabled(L_DBG, L_DBG_LVL_1, request) //!< True if request debug level 1 messages are enabled -#define RDEBUG_ENABLED2 log_debug_enabled(L_DBG, L_DBG_LVL_2, request) //!< True if request debug level 1-2 messages are enabled -#define RDEBUG_ENABLED3 log_debug_enabled(L_DBG, L_DBG_LVL_3, request) //!< True if request debug level 1-3 messages are enabled -#define RDEBUG_ENABLED4 log_debug_enabled(L_DBG, L_DBG_LVL_4, request) //!< True if request debug level 1-4 messages are enabled -#define RDEBUG_ENABLED5 log_debug_enabled(L_DBG, L_DBG_LVL_MAX, request) //!< True if request debug level 1-5 messages are enabled - -#define RDEBUGX(_l, fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG, _l, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RDEBUG(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG, L_DBG_LVL_1, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RDEBUG2(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG, L_DBG_LVL_2, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RDEBUG3(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG, L_DBG_LVL_3, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RDEBUG4(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG, L_DBG_LVL_4, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) - -#define RIDEBUG(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG_INFO, L_DBG_LVL_1, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RIDEBUG2(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG_INFO, L_DBG_LVL_2, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RIDEBUG3(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG_INFO, L_DBG_LVL_3, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RIDEBUG4(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG_INFO, L_DBG_LVL_4, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) - -#define RWDEBUG(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG_WARN, L_DBG_LVL_1, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RWDEBUG2(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG_WARN, L_DBG_LVL_2, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RWDEBUG3(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG_WARN, L_DBG_LVL_3, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RWDEBUG4(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request(L_DBG_WARN, L_DBG_LVL_4, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) - -#define RPWDEBUG(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request_perror(L_DBG_WARN, L_DBG_LVL_1, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RPWDEBUG2(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request_perror(L_DBG_WARN, L_DBG_LVL_2, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RPWDEBUG3(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request_perror(L_DBG_WARN, L_DBG_LVL_3, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) -#define RPWDEBUG4(fmt, ...) do { if (rad_debug_lvl || request->log.lvl) log_request_perror(L_DBG_WARN, L_DBG_LVL_4, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RDEBUG_ENABLED log_rdebug_enabled(L_DBG_LVL_1, request) //!< True if request debug level 1 messages are enabled +#define RDEBUG_ENABLED2 log_rdebug_enabled(L_DBG_LVL_2, request) //!< True if request debug level 1-2 messages are enabled +#define RDEBUG_ENABLED3 log_rdebug_enabled(L_DBG_LVL_3, request) //!< True if request debug level 1-3 messages are enabled +#define RDEBUG_ENABLED4 log_rdebug_enabled(L_DBG_LVL_4, request) //!< True if request debug level 1-4 messages are enabled +#define RDEBUG_ENABLED5 log_rdebug_enabled(L_DBG_LVL_MAX, request) //!< True if request debug level 1-5 messages are enabled + +#define RDEBUGX(_l, fmt, ...) do { if (request->log.lvl) log_request(L_DBG, _l, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RDEBUG(fmt, ...) do { if (request->log.lvl) log_request(L_DBG, L_DBG_LVL_1, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RDEBUG2(fmt, ...) do { if (request->log.lvl) log_request(L_DBG, L_DBG_LVL_2, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RDEBUG3(fmt, ...) do { if (request->log.lvl) log_request(L_DBG, L_DBG_LVL_3, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RDEBUG4(fmt, ...) do { if (request->log.lvl) log_request(L_DBG, L_DBG_LVL_4, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) + +#define RIDEBUG(fmt, ...) do { if (request->log.lvl) log_request(L_DBG_INFO, L_DBG_LVL_1, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RIDEBUG2(fmt, ...) do { if (request->log.lvl) log_request(L_DBG_INFO, L_DBG_LVL_2, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RIDEBUG3(fmt, ...) do { if (request->log.lvl) log_request(L_DBG_INFO, L_DBG_LVL_3, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RIDEBUG4(fmt, ...) do { if (request->log.lvl) log_request(L_DBG_INFO, L_DBG_LVL_4, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) + +#define RWDEBUG(fmt, ...) do { if (request->log.lvl) log_request(L_DBG_WARN, L_DBG_LVL_1, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RWDEBUG2(fmt, ...) do { if (request->log.lvl) log_request(L_DBG_WARN, L_DBG_LVL_2, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RWDEBUG3(fmt, ...) do { if (request->log.lvl) log_request(L_DBG_WARN, L_DBG_LVL_3, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RWDEBUG4(fmt, ...) do { if (request->log.lvl) log_request(L_DBG_WARN, L_DBG_LVL_4, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) + +#define RPWDEBUG(fmt, ...) do { if (request->log.lvl) log_request_perror(L_DBG_WARN, L_DBG_LVL_1, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RPWDEBUG2(fmt, ...) do { if (request->log.lvl) log_request_perror(L_DBG_WARN, L_DBG_LVL_2, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RPWDEBUG3(fmt, ...) do { if (request->log.lvl) log_request_perror(L_DBG_WARN, L_DBG_LVL_3, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) +#define RPWDEBUG4(fmt, ...) do { if (request->log.lvl) log_request_perror(L_DBG_WARN, L_DBG_LVL_4, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__); } while(0) #define REDEBUG(fmt, ...) log_request_error(L_DBG_ERR, L_DBG_LVL_1, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__) #define REDEBUG2(fmt, ...) log_request_error(L_DBG_ERR, L_DBG_LVL_2, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__) @@ -486,7 +482,7 @@ do {\ * @param[in] ... Additional arguments to print. */ #define _RHEXDUMP_INLINE(_lvl, _data, _len, _fmt, ...) \ - if (log_debug_enabled(L_DBG, _lvl, request)) { \ + if (log_rdebug_enabled(_lvl, request)) { \ log_request(L_DBG, _lvl, request, __FILE__, __LINE__, _fmt " 0x%pH", ## __VA_ARGS__, fr_box_octets(_data, _len)); \ } @@ -504,7 +500,7 @@ do {\ * @param[in] ... Additional arguments to print. */ #define _RHEXDUMP(_lvl, _data, _len, _fmt, ...) \ - if (log_debug_enabled(L_DBG,_lvl, request)) do { \ + if (log_rdebug_enabled(_lvl, request)) do { \ log_request(L_DBG, _lvl, request, __FILE__, __LINE__, _fmt, ## __VA_ARGS__); \ log_request_hex(L_DBG, _lvl, request, __FILE__, __LINE__, _data, _len); \ } while (0) diff --git a/src/lib/server/main_config.c b/src/lib/server/main_config.c index 7cc54ae8e89..739e45f6182 100644 --- a/src/lib/server/main_config.c +++ b/src/lib/server/main_config.c @@ -967,7 +967,7 @@ do {\ * removes the "Debug : " prefix from the log messages. */ p = getenv("TERM"); - if (p && isatty(default_log.fd) && strstr(p, "xterm") && rad_debug_lvl) { + if (p && isatty(default_log.fd) && strstr(p, "xterm") && fr_debug_lvl) { default_log.colourise = true; } else { default_log.colourise = false; @@ -1201,13 +1201,7 @@ do {\ * command-line: use whatever is in the config * file. */ - if (rad_debug_lvl == 0) rad_debug_lvl = config->debug_level; - - /* - * Set the same debug level for the global log - * for requests, and for libfreeradius, and for requests. - */ - fr_debug_lvl = req_debug_lvl = rad_debug_lvl; + if (fr_debug_lvl == 0) fr_debug_lvl = config->debug_level; INFO("Switching to configured log settings"); diff --git a/src/lib/server/request.c b/src/lib/server/request.c index 09c129d8060..2c2f0fe661c 100644 --- a/src/lib/server/request.c +++ b/src/lib/server/request.c @@ -80,7 +80,7 @@ REQUEST *request_alloc(TALLOC_CTX *ctx) /* * These may be changed later by request_pre_handler */ - request->log.lvl = req_debug_lvl; /* Default to global debug level */ + request->log.lvl = fr_debug_lvl; /* Default to global debug level */ request->log.dst = talloc_zero(request, log_dst_t); request->log.dst->func = vlog_request; request->log.dst->uctx = &default_log; diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c index 47ee9231ea1..ad4b4c56e43 100644 --- a/src/modules/proto_bfd/proto_bfd.c +++ b/src/modules/proto_bfd/proto_bfd.c @@ -1351,12 +1351,12 @@ static int bfd_process(bfd_state_t *session, bfd_packet_t *bfd) * FIXME: add my state, remote state as VPs? */ - if (rad_debug_lvl) { + if (fr_debug_lvl) { request->log.dst = talloc_zero(request, log_dst_t); request->log.dst->func = vlog_request; request->log.dst->uctx = &default_log; - request->log.lvl = RAD_REQUEST_LVL_DEBUG2; + request->log.lvl = fr_debug_lvl; } request->component = NULL; request->module = NULL; diff --git a/src/modules/proto_control/radmin.c b/src/modules/proto_control/radmin.c index c8a83c28ea7..522b2856e52 100644 --- a/src/modules/proto_control/radmin.c +++ b/src/modules/proto_control/radmin.c @@ -767,7 +767,7 @@ int main(int argc, char **argv) progname++; } - rad_debug_lvl = L_DBG_LVL_1; + fr_debug_lvl = L_DBG_LVL_1; while ((c = getopt(argc, argv, "d:D:hi:e:Ef:n:qs:S:x")) != -1) switch (c) { case 'd': @@ -823,7 +823,7 @@ int main(int argc, char **argv) case 'q': quiet = true; - if (rad_debug_lvl > 0) rad_debug_lvl--; + if (fr_debug_lvl > 0) fr_debug_lvl--; break; case 's': @@ -839,7 +839,7 @@ int main(int argc, char **argv) break; case 'x': - rad_debug_lvl++; + fr_debug_lvl++; break; } diff --git a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c index 235f9dad080..98b654a2569 100644 --- a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c +++ b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c @@ -1274,7 +1274,7 @@ static int match_keyword(rlm_isc_dhcp_info_t *parent, rlm_isc_dhcp_tokenizer_t * * We don't need to spam the main log file every * time the server starts. */ - if (rad_debug_lvl) { + if (DEBUG_ENABLED) { if (tokens[half].type == ISC_NOOP) { WARN("Command '%.*s' is not yet implemented.", state->token_len, state->token); diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c index 0905404db2b..b924d904a01 100644 --- a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c +++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c @@ -1364,7 +1364,6 @@ int main(int argc, char *argv[]) ippool_tool_t *conf; fr_debug_lvl = 0; - rad_debug_lvl = 0; name = argv[0]; conf = talloc_zero(NULL, ippool_tool_t); @@ -1446,7 +1445,6 @@ do { \ case 'x': fr_debug_lvl++; - rad_debug_lvl++; break; case 'o': diff --git a/src/modules/rlm_unbound/rlm_unbound.c b/src/modules/rlm_unbound/rlm_unbound.c index c717969e034..1490759d204 100644 --- a/src/modules/rlm_unbound/rlm_unbound.c +++ b/src/modules/rlm_unbound/rlm_unbound.c @@ -438,11 +438,11 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) /* Glean some default settings to match the main server. */ /* TODO: debug_level can be changed at runtime. */ - /* TODO: log until fork when stdout or stderr and !rad_debug_lvl. */ + /* TODO: log until fork when stdout or stderr and !fr_debug_lvl. */ log_level = 0; - if (rad_debug_lvl > 0) { - log_level = rad_debug_lvl; + if (fr_debug_lvl > 0) { + log_level = fr_debug_lvl; } else if (main_config->debug_level > 0) { log_level = main_config->debug_level; @@ -480,7 +480,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) switch (default_log.dst) { case L_DST_STDOUT: - if (!rad_debug_lvl) { + if (!fr_debug_lvl) { log_dst = L_DST_NULL; break; } @@ -489,7 +489,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) break; case L_DST_STDERR: - if (!rad_debug_lvl) { + if (!fr_debug_lvl) { log_dst = L_DST_NULL; break; } @@ -584,7 +584,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) log_fd = -1; } - } else if (!rad_debug_lvl) { + } else if (!fr_debug_lvl) { log_dst = L_DST_NULL; }