notify,xfr: unify log messages

diff --git a/src/knot/events/handlers/notify.c b/src/knot/events/handlers/notify.c
index 0648afae8ec5c3b7b466abd94c09105f5c739fe8..f46c1cfd693d9d308ae8057f28e7ba87a209ace2 100644 (file)
--- a/src/knot/events/handlers/notify.c
+++ b/src/knot/events/handlers/notify.c
@@ -72,7 +72,7 @@ static const knot_layer_api_t NOTIFY_API = {
        .consume = notify_consume,
 };
 
-#define NOTIFY_LOG(priority, zone, remote, fmt, ...) \
+#define NOTIFY_OUT_LOG(priority, zone, remote, fmt, ...) \
        ns_log(priority, zone, LOG_OPERATION_NOTIFY, LOG_DIRECTION_OUT, remote, \
               fmt, ## __VA_ARGS__)
 
@@ -108,15 +108,15 @@ static int send_notify(conf_t *conf, zone_t *zone, const knot_rrset_t *soa,
        int ret = knot_requestor_exec(&requestor, req, timeout);
 
        if (ret == KNOT_EOK && knot_pkt_ext_rcode(req->resp) == 0) {
-               NOTIFY_LOG(LOG_INFO, zone->name, dst,
-                          "serial %u", knot_soa_serial(soa->rrs.rdata));
+               NOTIFY_OUT_LOG(LOG_INFO, zone->name, dst,
+                              "serial %u", knot_soa_serial(soa->rrs.rdata));
        } else if (knot_pkt_ext_rcode(req->resp) == 0) {
-               NOTIFY_LOG(LOG_WARNING, zone->name, dst,
-                          "failed (%s)", knot_strerror(ret));
+               NOTIFY_OUT_LOG(LOG_WARNING, zone->name, dst,
+                              "failed (%s)", knot_strerror(ret));
        } else {
-               NOTIFY_LOG(LOG_WARNING, zone->name, dst,
-                          "server responded with error '%s'",
-                          knot_pkt_ext_rcode_name(req->resp));
+               NOTIFY_OUT_LOG(LOG_WARNING, zone->name, dst,
+                              "server responded with error '%s'",
+                              knot_pkt_ext_rcode_name(req->resp));
        }
 
        knot_request_free(req, NULL);

diff --git a/src/knot/events/handlers/refresh.c b/src/knot/events/handlers/refresh.c
index 9fae77634cffc8f55b78d21b1751a8cc3a8b3fb9..e80f6240ca33ce5cda4d2424099ddc75ee5f0ee5 100644 (file)
--- a/src/knot/events/handlers/refresh.c
+++ b/src/knot/events/handlers/refresh.c
@@ -380,7 +380,7 @@ static int axfr_consume(knot_pkt_t *pkt, struct refresh_data *data)
                        return KNOT_STATE_FAIL;
                }
 
-               AXFRIN_LOG(LOG_INFO, data->zone->name, data->remote, "starting");
+               AXFRIN_LOG(LOG_INFO, data->zone->name, data->remote, "started");
                xfr_stats_begin(&data->stats);
                data->change_size = 0;
        }
@@ -850,7 +850,7 @@ static int ixfr_consume(knot_pkt_t *pkt, struct refresh_data *data)
                        return KNOT_STATE_FAIL;
                }
 
-               IXFRIN_LOG(LOG_INFO, data->zone->name, data->remote, "starting");
+               IXFRIN_LOG(LOG_INFO, data->zone->name, data->remote, "started");
                xfr_stats_begin(&data->stats);
                data->change_size = 0;
        }

diff --git a/src/knot/nameserver/notify.c b/src/knot/nameserver/notify.c
index a4a94fd1bd57e79f163a34bf4146f6ba96c15bac..b8b677a1f0409c257acfc25c61561a85e8a457af 100644 (file)
--- a/src/knot/nameserver/notify.c
+++ b/src/knot/nameserver/notify.c
@@ -24,7 +24,7 @@
 #include "libdnssec/random.h"
 #include "libknot/libknot.h"
 
-#define NOTIFY_LOG(priority, qdata, fmt...) \
+#define NOTIFY_IN_LOG(priority, qdata, fmt...) \
        ns_log(priority, knot_pkt_qname(qdata->query), LOG_OPERATION_NOTIFY, \
               LOG_DIRECTION_IN, qdata->params->remote, fmt)
 
@@ -51,7 +51,7 @@ int notify_process_query(knot_pkt_t *pkt, knotd_qdata_t *qdata)
                case KNOT_RCODE_NOTAUTH: /* Not authorized, already logged. */
                        break;
                default:                 /* Other errors. */
-                       NOTIFY_LOG(LOG_DEBUG, qdata, "invalid query");
+                       NOTIFY_IN_LOG(LOG_DEBUG, qdata, "invalid query");
                        break;
                }
                return state;
@@ -71,16 +71,16 @@ int notify_process_query(knot_pkt_t *pkt, knotd_qdata_t *qdata)
                if (soa->type == KNOT_RRTYPE_SOA) {
                        uint32_t zone_serial, serial = knot_soa_serial(soa->rrs.rdata);
                        (void)slave_zone_serial(zone, conf(), &zone_serial);
-                       NOTIFY_LOG(LOG_INFO, qdata, "received, serial %u", serial);
+                       NOTIFY_IN_LOG(LOG_INFO, qdata, "serial %u", serial);
                        if (serial_equal(serial, zone_serial)) {
                                // NOTIFY serial == zone serial => ignore, keep timers
                                return KNOT_STATE_DONE;
                        }
                } else { /* Complain, but accept N/A record. */
-                       NOTIFY_LOG(LOG_NOTICE, qdata, "received, bad record in answer section");
+                       NOTIFY_IN_LOG(LOG_NOTICE, qdata, "bad record in answer section");
                }
        } else {
-               NOTIFY_LOG(LOG_INFO, qdata, "received, serial none");
+               NOTIFY_IN_LOG(LOG_INFO, qdata, "serial none");
        }
 
        /* Incoming NOTIFY expires REFRESH timer and renews EXPIRE timer. */