From f3fba53e35158b1517b03ef8bfec7614adb45255 Mon Sep 17 00:00:00 2001 From: Marek Vavrusa <marek.vavrusa@nic.cz> Date: Tue, 19 Mar 2013 14:16:48 +0100 Subject: [PATCH] Removed 'answering' log source. This was deprecated and unused for a long time, decision to not log queries was made. --- doc/reference.texi | 1 - src/common/log.h | 10 +--------- src/knot/conf/cf-lex.l | 1 - src/knot/server/server.c | 2 +- src/knot/server/zones.c | 2 +- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/doc/reference.texi b/doc/reference.texi index bb2bf39184..f1377634f5 100644 --- a/doc/reference.texi +++ b/doc/reference.texi @@ -853,7 +853,6 @@ Knot DNS allows user to choose from these logging categories: @itemize @item @emph{server} - Messages related to general operation of the server. @item @emph{zone} - Messages related to zones, zone parsing and loading. -@item @emph{answering} - Messages regarding query processing and response creation. @item @emph{any} - All categories. @end itemize diff --git a/src/common/log.h b/src/common/log.h index 639957c4c5..36e0a1b4f7 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -53,8 +53,7 @@ typedef enum { /*! \brief Log sources (max. LOG_SRC_BITS bits). */ typedef enum { - LOG_SERVER = 0, /*!< Server module. */ - LOG_ANSWER = 1, /*!< Query answering module. */ + LOG_SERVER = 1, /*!< Server module. */ LOG_ZONE = 2, /*!< Zone manipulation module. */ LOG_ANY = 7 /*!< Any module. */ } logsrc_t; @@ -189,13 +188,6 @@ void hex_log(int source, const char *data, int length); #define log_server_info(msg...) log_msg(LOG_SERVER, LOG_INFO, msg) #define log_server_debug(msg...) log_msg(LOG_SERVER, LOG_DEBUG, msg) -#define log_answer_fatal(msg...) log_msg(LOG_ANSWER, LOG_FATAL, msg) -#define log_answer_error(msg...) log_msg(LOG_ANSWER, LOG_ERR, msg) -#define log_answer_warning(msg...) log_msg(LOG_ANSWER, LOG_WARNING, msg) -#define log_answer_notice(msg...) log_msg(LOG_ANSWER, LOG_NOTICE, msg) -#define log_answer_info(msg...) log_msg(LOG_ANSWER, LOG_INFO, msg) -#define log_answer_debug(msg...) log_msg(LOG_ANSWER, LOG_DEBUG, msg) - #define log_zone_fatal(msg...) log_msg(LOG_ZONE, LOG_FATAL, msg) #define log_zone_error(msg...) log_msg(LOG_ZONE, LOG_ERR, msg) #define log_zone_warning(msg...) log_msg(LOG_ZONE, LOG_WARNING, msg) diff --git a/src/knot/conf/cf-lex.l b/src/knot/conf/cf-lex.l index 5a539179ad..722a0ebe96 100644 --- a/src/knot/conf/cf-lex.l +++ b/src/knot/conf/cf-lex.l @@ -112,7 +112,6 @@ log { lval.t = yytext; return LOG; } any { lval.t = yytext; lval.i = LOG_ANY; return LOG_SRC; } server { lval.t = yytext; lval.i = LOG_SERVER; return LOG_SRC; } -answering { lval.t = yytext; lval.i = LOG_ANSWER; return LOG_SRC; } zone { lval.t = yytext; lval.i = LOG_ZONE; return LOG_SRC; } stdout { lval.t = yytext; lval.i = LOGT_STDOUT; return LOG_DEST; } stderr { lval.t = yytext; lval.i = LOGT_STDERR; return LOG_DEST; } diff --git a/src/knot/server/server.c b/src/knot/server/server.c index 4ac919ddc4..f5b88c8fba 100644 --- a/src/knot/server/server.c +++ b/src/knot/server/server.c @@ -652,7 +652,7 @@ int server_refresh(server_t *server) if (zd->xfr_in.timer) { evsched_cancel(sch, zd->xfr_in.timer); evsched_schedule(sch, zd->xfr_in.timer, - tls_rand() * 500 + i/2); + tls_rand() * 500 + i/4); /* Cumulative delay. */ } } diff --git a/src/knot/server/zones.c b/src/knot/server/zones.c index a06484df24..564de38055 100644 --- a/src/knot/server/zones.c +++ b/src/knot/server/zones.c @@ -4059,7 +4059,7 @@ int zones_verify_tsig_query(const knot_packet_t *query, */ tsig_algorithm_t alg = tsig_rdata_alg(tsig_rr); if (tsig_alg_digest_length(alg) == 0) { - log_answer_info("Unsupported digest algorithm " + log_server_info("Unsupported digest algorithm " "requested, treating as bad key\n"); /*! \todo [TSIG] It is unclear from RFC if I * should treat is as a bad key -- GitLab