From c90f5e8d1edbd5c277f2ee320167a12a30ba7c7b Mon Sep 17 00:00:00 2001 From: Michael Graff Date: Wed, 3 May 2000 21:11:40 +0000 Subject: [PATCH] Split dns_log_init() into dns_log_init() which sets up module and category names, and dns_log_setcontext() which sets the logging context. Call isc_log_setcontext(), dns_log_init(), and dns_log_setcontext(). --- bin/dnssec/dnssec-makekeyset.c | 2 ++ bin/dnssec/dnssec-signkey.c | 2 ++ bin/dnssec/dnssec-signzone.c | 2 ++ bin/lwresd/main.c | 2 ++ bin/named/log.c | 2 ++ bin/tests/Makefile.in | 1 - bin/tests/adb_test.c | 3 +++ bin/tests/byname_test.c | 2 ++ bin/tests/dispatch_tcp_test.c | 1 + bin/tests/dispatch_test.c | 1 + bin/tests/keysettool.c | 2 ++ bin/tests/keysigner.c | 2 ++ bin/tests/log_test.c | 4 +++- bin/tests/nconf_test.c | 2 ++ bin/tests/ndcconf_test.c | 2 ++ bin/tests/rbt_test.c | 1 + bin/tests/shutdown_test.c | 1 + bin/tests/signer.c | 2 ++ bin/tests/sym_test.c | 1 + bin/tests/tkey_test.c | 2 ++ bin/tests/zone2_test.c | 1 + bin/tests/zone_test.c | 2 ++ lib/dns/include/dns/log.h | 16 ++++++++++++++-- lib/dns/log.c | 15 +++++++++++---- 24 files changed, 63 insertions(+), 8 deletions(-) diff --git a/bin/dnssec/dnssec-makekeyset.c b/bin/dnssec/dnssec-makekeyset.c index 2bcd86cc30..5557d34a94 100644 --- a/bin/dnssec/dnssec-makekeyset.c +++ b/bin/dnssec/dnssec-makekeyset.c @@ -230,7 +230,9 @@ main(int argc, char *argv[]) { if (verbose > 0) { RUNTIME_CHECK(isc_log_create(mctx, &log, &logconfig) == ISC_R_SUCCESS); + isc_log_setcontext(log); dns_log_init(log); + dns_log_setcontext(log); RUNTIME_CHECK(isc_log_usechannel(logconfig, "default_stderr", NULL, NULL) == ISC_R_SUCCESS); } diff --git a/bin/dnssec/dnssec-signkey.c b/bin/dnssec/dnssec-signkey.c index 773ba4b042..d93142e113 100644 --- a/bin/dnssec/dnssec-signkey.c +++ b/bin/dnssec/dnssec-signkey.c @@ -209,7 +209,9 @@ main(int argc, char *argv[]) { if (verbose > 0) { RUNTIME_CHECK(isc_log_create(mctx, &log, &logconfig) == ISC_R_SUCCESS); + isc_log_setcontext(log); dns_log_init(log); + dns_log_setcontext(log); RUNTIME_CHECK(isc_log_usechannel(logconfig, "default_stderr", NULL, NULL) == ISC_R_SUCCESS); } diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 5f6ef31cd9..1dd06e13c2 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -1374,7 +1374,9 @@ main(int argc, char *argv[]) { if (verbose > 0) { RUNTIME_CHECK(isc_log_create(mctx, &log, &logconfig) == ISC_R_SUCCESS); + isc_log_setcontext(log); dns_log_init(log); + dns_log_setcontext(log); RUNTIME_CHECK(isc_log_usechannel(logconfig, "default_stderr", NULL, NULL) == ISC_R_SUCCESS); } diff --git a/bin/lwresd/main.c b/bin/lwresd/main.c index edc651172c..cb10be6f20 100644 --- a/bin/lwresd/main.c +++ b/bin/lwresd/main.c @@ -237,7 +237,9 @@ main(int argc, char **argv) { lctx = NULL; result = isc_log_create(mem, &lctx, &lcfg); INSIST(result == ISC_R_SUCCESS); + isc_log_setcontext(lctx); dns_log_init(lctx); + dns_log_setcontext(lctx); destination.file.stream = stderr; destination.file.name = NULL; diff --git a/bin/named/log.c b/bin/named/log.c index 01f7986096..fce173d0ac 100644 --- a/bin/named/log.c +++ b/bin/named/log.c @@ -72,7 +72,9 @@ ns_log_init(isc_boolean_t safe) { isc_log_registercategories(ns_g_lctx, ns_g_categories); isc_log_registermodules(ns_g_lctx, ns_g_modules); + isc_log_setcontext(ns_g_lctx); dns_log_init(ns_g_lctx); + dns_log_setcontext(ns_g_lctx); if (safe) result = ns_log_setsafechannels(lcfg); diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index 9a435b09c3..d212ea4de8 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -79,7 +79,6 @@ XTARGETS = adb_test \ timer_test \ tkey_test \ wire_test \ - zone_test \ zone2_test # Alphabetically diff --git a/bin/tests/adb_test.c b/bin/tests/adb_test.c index 275b6bf096..3267b18c19 100644 --- a/bin/tests/adb_test.c +++ b/bin/tests/adb_test.c @@ -43,6 +43,7 @@ #include #include #include +#include typedef struct client client_t; struct client { @@ -294,7 +295,9 @@ main(int argc, char **argv) result = isc_log_create(mctx, &lctx, &lcfg); check_result(result, "isc_log_create()"); + isc_log_setcontext(lctx); dns_log_init(lctx); + dns_log_setcontext(lctx); /* * Create and install the default channel. diff --git a/bin/tests/byname_test.c b/bin/tests/byname_test.c index 5944f8ecfd..4c7450fd0d 100644 --- a/bin/tests/byname_test.c +++ b/bin/tests/byname_test.c @@ -79,7 +79,9 @@ log_init(void) { * Setup a logging context. */ RUNTIME_CHECK(isc_log_create(mctx, &lctx, &lcfg) == ISC_R_SUCCESS); + isc_log_setcontext(lctx); dns_log_init(lctx); + dns_log_setcontext(lctx); /* * Create and install the default channel. diff --git a/bin/tests/dispatch_tcp_test.c b/bin/tests/dispatch_tcp_test.c index 2b5ffa5fa9..763e8639ee 100644 --- a/bin/tests/dispatch_tcp_test.c +++ b/bin/tests/dispatch_tcp_test.c @@ -43,6 +43,7 @@ #include #include #include +#include #include "printmsg.h" diff --git a/bin/tests/dispatch_test.c b/bin/tests/dispatch_test.c index b1271127b1..350ae7df4b 100644 --- a/bin/tests/dispatch_test.c +++ b/bin/tests/dispatch_test.c @@ -44,6 +44,7 @@ #include #include #include +#include #include "printmsg.h" diff --git a/bin/tests/keysettool.c b/bin/tests/keysettool.c index 2bcd86cc30..5557d34a94 100644 --- a/bin/tests/keysettool.c +++ b/bin/tests/keysettool.c @@ -230,7 +230,9 @@ main(int argc, char *argv[]) { if (verbose > 0) { RUNTIME_CHECK(isc_log_create(mctx, &log, &logconfig) == ISC_R_SUCCESS); + isc_log_setcontext(log); dns_log_init(log); + dns_log_setcontext(log); RUNTIME_CHECK(isc_log_usechannel(logconfig, "default_stderr", NULL, NULL) == ISC_R_SUCCESS); } diff --git a/bin/tests/keysigner.c b/bin/tests/keysigner.c index 773ba4b042..d93142e113 100644 --- a/bin/tests/keysigner.c +++ b/bin/tests/keysigner.c @@ -209,7 +209,9 @@ main(int argc, char *argv[]) { if (verbose > 0) { RUNTIME_CHECK(isc_log_create(mctx, &log, &logconfig) == ISC_R_SUCCESS); + isc_log_setcontext(log); dns_log_init(log); + dns_log_setcontext(log); RUNTIME_CHECK(isc_log_usechannel(logconfig, "default_stderr", NULL, NULL) == ISC_R_SUCCESS); } diff --git a/bin/tests/log_test.c b/bin/tests/log_test.c index e1c6d1cf99..a419cc638d 100644 --- a/bin/tests/log_test.c +++ b/bin/tests/log_test.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: log_test.c,v 1.12 2000/04/06 20:28:29 tale Exp $ */ +/* $Id: log_test.c,v 1.13 2000/05/03 21:11:26 explorer Exp $ */ /* Principal Authors: DCL */ @@ -118,7 +118,9 @@ main (int argc, char **argv) { CHECK_ISC(isc_mem_create(0, 0, &mctx)); CHECK_ISC(isc_log_create(mctx, &lctx, &lcfg)); + isc_log_setcontext(lctx); dns_log_init(lctx); + dns_log_setcontext(lctx); /* * Test isc_log_categorybyname and isc_log_modulebyname. diff --git a/bin/tests/nconf_test.c b/bin/tests/nconf_test.c index 39260c3f65..3955b54163 100644 --- a/bin/tests/nconf_test.c +++ b/bin/tests/nconf_test.c @@ -113,7 +113,9 @@ int main (int argc, char **argv) { RUNTIME_CHECK(isc_mem_create(0, 0, &mem) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_log_create(mem, &log, &logcfg) == ISC_R_SUCCESS); + isc_log_setcontext(log); dns_log_init(log); + dns_log_setcontext(log); RUNTIME_CHECK(isc_log_usechannel(logcfg, "default_stderr", NULL, NULL) == ISC_R_SUCCESS); diff --git a/bin/tests/ndcconf_test.c b/bin/tests/ndcconf_test.c index 46d1c5b948..93d6b58c71 100644 --- a/bin/tests/ndcconf_test.c +++ b/bin/tests/ndcconf_test.c @@ -58,7 +58,9 @@ int main (int argc, char **argv) { RUNTIME_CHECK(isc_mem_create(0, 0, &mem) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_log_create(mem, &log, &logcfg) == ISC_R_SUCCESS); + isc_log_setcontext(log); dns_log_init(log); + dns_log_setcontext(log); RUNTIME_CHECK(isc_log_usechannel(logcfg, "default_stderr", NULL, NULL) == ISC_R_SUCCESS); diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c index bdb8e7b86b..c1715f68fb 100644 --- a/bin/tests/rbt_test.c +++ b/bin/tests/rbt_test.c @@ -25,6 +25,7 @@ #include #include +#include char *progname; isc_mem_t *mctx; diff --git a/bin/tests/shutdown_test.c b/bin/tests/shutdown_test.c index b7e9d3179d..b08fecf0fc 100644 --- a/bin/tests/shutdown_test.c +++ b/bin/tests/shutdown_test.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/bin/tests/signer.c b/bin/tests/signer.c index 5f6ef31cd9..1dd06e13c2 100644 --- a/bin/tests/signer.c +++ b/bin/tests/signer.c @@ -1374,7 +1374,9 @@ main(int argc, char *argv[]) { if (verbose > 0) { RUNTIME_CHECK(isc_log_create(mctx, &log, &logconfig) == ISC_R_SUCCESS); + isc_log_setcontext(log); dns_log_init(log); + dns_log_setcontext(log); RUNTIME_CHECK(isc_log_usechannel(logconfig, "default_stderr", NULL, NULL) == ISC_R_SUCCESS); } diff --git a/bin/tests/sym_test.c b/bin/tests/sym_test.c index cbb657c5e9..928b24e822 100644 --- a/bin/tests/sym_test.c +++ b/bin/tests/sym_test.c @@ -27,6 +27,7 @@ #include #include #include +#include isc_mem_t *mctx; isc_symtab_t *st; diff --git a/bin/tests/tkey_test.c b/bin/tests/tkey_test.c index 15fe1331e0..6b1f6dcd08 100644 --- a/bin/tests/tkey_test.c +++ b/bin/tests/tkey_test.c @@ -52,6 +52,8 @@ #include #include +#include + #define CHECK(str, x) { \ if ((x) != ISC_R_SUCCESS) { \ printf("%s: %s\n", (str), isc_result_totext(x)); \ diff --git a/bin/tests/zone2_test.c b/bin/tests/zone2_test.c index 788f9f3cbe..15151b2bf4 100644 --- a/bin/tests/zone2_test.c +++ b/bin/tests/zone2_test.c @@ -33,6 +33,7 @@ #include #include #include +#include #define ERRRET(result, function) \ do { \ diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c index 3a3d7f4575..8e9f547747 100644 --- a/bin/tests/zone_test.c +++ b/bin/tests/zone_test.c @@ -31,6 +31,8 @@ #include #include +#include + static int debug = 0; static int quiet = 0; static int stats = 0; diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index 5007c21d37..b8d9e7b668 100644 --- a/lib/dns/include/dns/log.h +++ b/lib/dns/include/dns/log.h @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: log.h,v 1.17 2000/05/02 03:54:08 tale Exp $ */ +/* $Id: log.h,v 1.18 2000/05/03 21:11:40 explorer Exp $ */ /* Principal Authors: DCL */ @@ -66,7 +66,7 @@ ISC_LANG_BEGINDECLS void dns_log_init(isc_log_t *lctx); /* - * Make the libdns.a categories and modules available for use with the + * Make the libdns categories and modules available for use with the * ISC logging library. * * Requires: @@ -79,6 +79,18 @@ dns_log_init(isc_log_t *lctx); * use by isc_log_usechannnel() and isc_log_write(). */ +void +dns_log_setcontext(isc_log_t *lctx); +/* + * Make the libdns library use the provided context for logging internal + * messages. + * + * Requires: + * lctx is a valid logging context. + * + * dns_log_setcontext() is called only once. + */ + ISC_LANG_ENDDECLS #endif /* DNS_LOG_H */ diff --git a/lib/dns/log.c b/lib/dns/log.c index aaada69d5f..9ff513c7d2 100644 --- a/lib/dns/log.c +++ b/lib/dns/log.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: log.c,v 1.19 2000/04/29 00:45:24 explorer Exp $ */ +/* $Id: log.c,v 1.20 2000/05/03 21:11:38 explorer Exp $ */ /* Principal Authors: DCL */ @@ -72,14 +72,21 @@ isc_logmodule_t dns_modules[] = { { NULL, 0 } }; -isc_log_t *dns_lctx; +isc_log_t *dns_lctx = NULL; void -dns_log_init(isc_log_t *lctx) { - REQUIRE(dns_lctx == NULL); +dns_log_init(isc_log_t *lctx) +{ + REQUIRE(lctx != NULL); isc_log_registercategories(lctx, dns_categories); isc_log_registermodules(lctx, dns_modules); +} + +void +dns_log_setcontext(isc_log_t *lctx) +{ + REQUIRE(dns_lctx == NULL); dns_lctx = lctx; }