mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 18:19:42 +00:00
Code Issues Releases Wiki Activity

remove log initialization checks from named

Browse Source 
This check is now redundant as there is a default global log context
created during libisc's constructor.
This commit is contained in:
Aydın Mercan 2025-02-28 09:43:56 +00:00
parent 58ea2b1b22
commit 68bbf151a4
3 changed files with 36 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/named/include/named/globals.h
View File

@ -86,7 +86,6 @@ EXTERN named_server_t *named_g_server INIT(NULL);
/* /*
* Logging. * Logging.
*/ */
EXTERN bool named_g_logging INIT(false);
EXTERN unsigned int named_g_debuglevel INIT(0); EXTERN unsigned int named_g_debuglevel INIT(0);
/* /*

2
bin/named/log.c
View File

@ -52,8 +52,6 @@ named_log_init(bool safe) {
named_log_setdefaultsslkeylogfile(lcfg); named_log_setdefaultsslkeylogfile(lcfg);
rcu_read_unlock(); rcu_read_unlock();
named_g_logging = true;
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
cleanup: cleanup:

109
bin/named/main.c
View File

@ -155,15 +155,8 @@ named_main_earlywarning(const char *format, ...) {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
if (named_g_logging) { isc_log_vwrite(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
isc_log_vwrite(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, ISC_LOG_WARNING, format, args);
ISC_LOG_WARNING, format, args);
} else {
fprintf(stderr, "%s: ", program_name);
vfprintf(stderr, format, args);
fprintf(stderr, "\n");
fflush(stderr);
}
va_end(args); va_end(args);
} }
@ -172,18 +165,10 @@ named_main_earlyfatal(const char *format, ...) {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
if (named_g_logging) { isc_log_vwrite(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
isc_log_vwrite(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, format, args);
ISC_LOG_CRITICAL, format, args); isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, "exiting (due to early fatal error)");
ISC_LOG_CRITICAL,
"exiting (due to early fatal error)");
} else {
fprintf(stderr, "%s: ", program_name);
vfprintf(stderr, format, args);
fprintf(stderr, "\n");
fflush(stderr);
}
va_end(args); va_end(args);
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
@ -200,26 +185,19 @@ assertion_failed(const char *file, int line, isc_assertiontype_t type,
* Handle assertion failures. * Handle assertion failures.
*/ */
if (named_g_logging) { /*
/* * Reset the assertion callback in case it is the log
* Reset the assertion callback in case it is the log * routines causing the assertion.
* routines causing the assertion. */
*/ isc_assertion_setcallback(NULL);
isc_assertion_setcallback(NULL);
isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
ISC_LOG_CRITICAL, "%s:%d: %s(%s) failed", file, ISC_LOG_CRITICAL, "%s:%d: %s(%s) failed", file, line,
line, isc_assertion_typetotext(type), cond); isc_assertion_typetotext(type), cond);
isc_backtrace_log(NAMED_LOGCATEGORY_GENERAL, isc_backtrace_log(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL); ISC_LOG_CRITICAL);
isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
ISC_LOG_CRITICAL, ISC_LOG_CRITICAL, "exiting (due to assertion failure)");
"exiting (due to assertion failure)");
} else {
fprintf(stderr, "%s:%d: %s(%s) failed\n", file, line,
isc_assertion_typetotext(type), cond);
fflush(stderr);
}
if (named_g_coreok) { if (named_g_coreok) {
abort(); abort();
@ -238,27 +216,20 @@ library_fatal_error(const char *file, int line, const char *func,
* Handle isc_error_fatal() calls from our libraries. * Handle isc_error_fatal() calls from our libraries.
*/ */
if (named_g_logging) { /*
/* * Reset the error callback in case it is the log
* Reset the error callback in case it is the log * routines causing the assertion.
* routines causing the assertion. */
*/ isc_error_setfatal(NULL);
isc_error_setfatal(NULL);
isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
ISC_LOG_CRITICAL, ISC_LOG_CRITICAL, "%s:%d:%s(): fatal error: ", file, line,
"%s:%d:%s(): fatal error: ", file, line, func); func);
isc_log_vwrite(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, isc_log_vwrite(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
ISC_LOG_CRITICAL, format, args); ISC_LOG_CRITICAL, format, args);
isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
ISC_LOG_CRITICAL, ISC_LOG_CRITICAL,
"exiting (due to fatal error in library)"); "exiting (due to fatal error in library)");
} else {
fprintf(stderr, "%s:%d:%s(): fatal error: ", file, line, func);
vfprintf(stderr, format, args);
fprintf(stderr, "\n");
fflush(stderr);
}
if (named_g_coreok) { if (named_g_coreok) {
abort(); abort();
@ -278,19 +249,11 @@ library_unexpected_error(const char *file, int line, const char *func,
* Handle isc_error_unexpected() calls from our libraries. * Handle isc_error_unexpected() calls from our libraries.
*/ */
if (named_g_logging) { isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, ISC_LOG_ERROR, "%s:%d:%s(): unexpected error: ", file,
ISC_LOG_ERROR, line, func);
"%s:%d:%s(): unexpected error: ", file, line, isc_log_vwrite(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
func); ISC_LOG_ERROR, format, args);
isc_log_vwrite(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN,
ISC_LOG_ERROR, format, args);
} else {
fprintf(stderr, "%s:%d:%s(): fatal error: ", file, line, func);
vfprintf(stderr, format, args);
fprintf(stderr, "\n");
fflush(stderr);
}
} }
static void static void