ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

log library UNEXPECTED_ERRORs through the logging system;

Browse Source 
end first line of two-line error messages with a colon
This commit is contained in:
Andreas Gustafsson
2000-02-14 19:40:36 +00:00
parent ec9f7bd203
commit 672b62dc2a
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bin/named/main.c
View File

@@ -120,7 +120,7 @@ library_fatal_error(char *file, int line, char *format, va_list args) {
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_MAIN, ISC_LOG_CRITICAL,
"%s:%d: fatal error", file, line);
"%s:%d: fatal error:", file, line);
isc_log_vwrite(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_MAIN, ISC_LOG_CRITICAL,
format, args);
@@ -139,6 +139,27 @@ library_fatal_error(char *file, int line, char *format, va_list args) {
exit(1);
}
static void
library_unexpected_error(char *file, int line, char *format, va_list args) {
/*
* Handle isc_error_unexpected() calls from our libraries.
*/
if (ns_g_lctx != NULL) {
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_MAIN, ISC_LOG_ERROR,
"%s:%d: unexpected error:", file, line);
isc_log_vwrite(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_MAIN, ISC_LOG_ERROR,
format, args);
} else {
fprintf(stderr, "%s:%d: fatal error: ", file, line);
vfprintf(stderr, format, args);
fprintf(stderr, "\n");
fflush(stderr);
}
}
static void
usage(void) {
fprintf(stderr,
@@ -322,6 +343,7 @@ main(int argc, char *argv[]) {
program_name = argv[0];
isc_assertion_setcallback(assertion_failed);
isc_error_setfatal(library_fatal_error);
isc_error_setunexpected(library_unexpected_error);
ns_os_init();