From 5fe5a0c02634eaadfcbc3528bf2c184557110a3b Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Thu, 23 Mar 2000 00:55:12 +0000 Subject: [PATCH] revised logging categories --- bin/named/include/named/log.h | 8 ++++---- bin/named/log.c | 5 +---- bin/named/notify.c | 6 +++--- bin/named/xfrout.c | 4 ++-- lib/dns/include/dns/log.h | 9 ++++++--- lib/dns/log.c | 20 ++++++++++---------- lib/isc/include/isc/log.h | 3 ++- lib/isc/log.c | 3 ++- 8 files changed, 30 insertions(+), 28 deletions(-) diff --git a/bin/named/include/named/log.h b/bin/named/include/named/log.h index dc0d5c02b6..74aac91d53 100644 --- a/bin/named/include/named/log.h +++ b/bin/named/include/named/log.h @@ -25,13 +25,13 @@ #include -#define NS_LOGCATEGORY_GENERAL (&ns_g_categories[0]) +/* Unused slot */ #define NS_LOGCATEGORY_CLIENT (&ns_g_categories[1]) #define NS_LOGCATEGORY_NETWORK (&ns_g_categories[2]) #define NS_LOGCATEGORY_UPDATE (&ns_g_categories[3]) -#define NS_LOGCATEGORY_XFER_IN (&ns_g_categories[4]) -#define NS_LOGCATEGORY_XFER_OUT (&ns_g_categories[5]) -#define NS_LOGCATEGORY_NOTIFY (&ns_g_categories[6]) + +/* Backwards compatibility. */ +#define NS_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL #define NS_LOGMODULE_MAIN (&ns_g_modules[0]) #define NS_LOGMODULE_CLIENT (&ns_g_modules[1]) diff --git a/bin/named/log.c b/bin/named/log.c index 0b89093548..f9c11bb91d 100644 --- a/bin/named/log.c +++ b/bin/named/log.c @@ -31,13 +31,10 @@ * #define to . */ static isc_logcategory_t categories[] = { - { "general", 0 }, + { "", 0 }, { "client", 0 }, { "network", 0 }, { "update", 0 }, - { "xfer-in", 0 }, - { "xfer-out", 0 }, - { "notify", 0 }, { NULL, 0 } }; diff --git a/bin/named/notify.c b/bin/named/notify.c index 318e50ebcf..082b20e7eb 100644 --- a/bin/named/notify.c +++ b/bin/named/notify.c @@ -65,7 +65,7 @@ * to use in reportings server errors. */ #define NOTIFY_ERROR_LOGARGS \ - ns_g_lctx, NS_LOGCATEGORY_NOTIFY, NS_LOGMODULE_NOTIFY, \ + ns_g_lctx, DNS_LOGCATEGORY_NOTIFY, NS_LOGMODULE_NOTIFY, \ ISC_LOG_ERROR /* @@ -73,7 +73,7 @@ * to use in tracing notify protocol requests. */ #define NOTIFY_PROTOCOL_LOGARGS \ - ns_g_lctx, NS_LOGCATEGORY_NOTIFY, NS_LOGMODULE_NOTIFY, \ + ns_g_lctx, DNS_LOGCATEGORY_NOTIFY, NS_LOGMODULE_NOTIFY, \ ISC_LOG_INFO /* @@ -81,7 +81,7 @@ * to use in low-level debug tracing. */ #define NOTIFY_DEBUG_LOGARGS \ - ns_g_lctx, NS_LOGCATEGORY_NOTIFY, NS_LOGMODULE_NOTIFY, \ + ns_g_lctx, DNS_LOGCATEGORY_NOTIFY, NS_LOGMODULE_NOTIFY, \ ISC_LOG_DEBUG(8) /* diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c index 274adad49f..91800a30df 100644 --- a/bin/named/xfrout.c +++ b/bin/named/xfrout.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: xfrout.c,v 1.48 2000/03/20 21:06:27 gson Exp $ */ +/* $Id: xfrout.c,v 1.49 2000/03/23 00:54:44 gson Exp $ */ #include @@ -67,7 +67,7 @@ */ #define XFROUT_COMMON_LOGARGS \ - ns_g_lctx, NS_LOGCATEGORY_XFER_OUT, NS_LOGMODULE_XFER_OUT + ns_g_lctx, DNS_LOGCATEGORY_XFER_OUT, NS_LOGMODULE_XFER_OUT #define XFROUT_PROTOCOL_LOGARGS \ XFROUT_COMMON_LOGARGS, ISC_LOG_INFO diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index e6354a2b57..2e1cda7d5c 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.12 2000/02/26 19:57:01 tale Exp $ */ +/* $Id: log.h,v 1.13 2000/03/23 00:53:45 gson Exp $ */ /* Principal Authors: DCL */ @@ -32,15 +32,18 @@ extern isc_log_t *dns_lctx; extern isc_logcategory_t dns_categories[]; extern isc_logmodule_t dns_modules[]; -#define DNS_LOGCATEGORY_GENERAL (&dns_categories[0]) +#define DNS_LOGCATEGORY_NOTIFY (&dns_categories[0]) #define DNS_LOGCATEGORY_DATABASE (&dns_categories[1]) #define DNS_LOGCATEGORY_SECURITY (&dns_categories[2]) #define DNS_LOGCATEGORY_CONFIG (&dns_categories[3]) -#define DNS_LOGCATEGORY_PARSER (&dns_categories[4]) +/* Unused slot */ #define DNS_LOGCATEGORY_RESOLVER (&dns_categories[5]) #define DNS_LOGCATEGORY_XFER_IN (&dns_categories[6]) #define DNS_LOGCATEGORY_XFER_OUT (&dns_categories[7]) +/* Backwards compatibility. */ +#define DNS_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL + #define DNS_LOGMODULE_DB (&dns_modules[0]) #define DNS_LOGMODULE_RBTDB (&dns_modules[1]) #define DNS_LOGMODULE_RBTDB64 (&dns_modules[2]) diff --git a/lib/dns/log.c b/lib/dns/log.c index 72f9f32597..ab87b8f918 100644 --- a/lib/dns/log.c +++ b/lib/dns/log.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: log.c,v 1.14 2000/02/26 19:57:00 tale Exp $ */ +/* $Id: log.c,v 1.15 2000/03/23 00:53:44 gson Exp $ */ /* Principal Authors: DCL */ @@ -31,15 +31,15 @@ * #define to . */ isc_logcategory_t dns_categories[] = { - { "dns_general", 0 }, - { "dns_database", 0 }, - { "dns_security", 0 }, - { "dns_config", 0 }, - { "dns_parser", 0 }, - { "dns_resolver", 0 }, - { "dns_xfer_in", 0 }, - { "dns_xfer_out", 0 }, - { NULL, 0 } + { "notify", 0 }, + { "database", 0 }, + { "security", 0 }, + { "config", 0 }, + { "", 0 }, + { "resolver", 0 }, + { "xfer-in", 0 }, + { "xfer-out", 0 }, + { NULL, 0 } }; /* diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h index 68444c39dd..87915afcbb 100644 --- a/lib/isc/include/isc/log.h +++ b/lib/isc/include/isc/log.h @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: log.h,v 1.13 2000/03/04 16:41:14 tale Exp $ */ +/* $Id: log.h,v 1.14 2000/03/23 00:53:05 gson Exp $ */ #ifndef ISC_LOG_H #define ISC_LOG_H 1 @@ -142,6 +142,7 @@ typedef union isc_logdestination { extern isc_logcategory_t isc_categories[]; #define ISC_LOGCATEGORY_DEFAULT (&isc_categories[0]) +#define ISC_LOGCATEGORY_GENERAL (&isc_categories[1]) isc_result_t isc_log_create(isc_mem_t *mctx, isc_log_t **lctxp, isc_logconfig_t **lcfgp); diff --git a/lib/isc/log.c b/lib/isc/log.c index 4148668305..e46a78bbbf 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: log.c,v 1.23 2000/03/23 00:49:15 gson Exp $ */ +/* $Id: log.c,v 1.24 2000/03/23 00:53:04 gson Exp $ */ /* Principal Authors: DCL */ @@ -170,6 +170,7 @@ static const int syslog_map[] = { */ isc_logcategory_t isc_categories[] = { { "default", 0 }, /* "default" must come first. */ + { "general", 0 }, { NULL, 0 } };