Skip to content
Snippets Groups Projects
Commit e1c4e111 authored by Daniel Salzman's avatar Daniel Salzman
Browse files

refresh: unify log messages

parent 76fef9aa
No related branches found
No related tags found
No related merge requests found
Pipeline #52120 passed
......@@ -198,6 +198,11 @@ static void xfr_log_publish(const struct refresh_data *data,
duration, old_info, new_serial, master_info);
}
static void xfr_log_read_ms(const knot_dname_t *zone, int ret)
{
log_zone_error(zone, "failed reading master's serial from KASP DB (%s)", knot_strerror(ret));
}
static int axfr_init(struct refresh_data *data)
{
zone_contents_t *new_zone = zone_contents_new(data->zone->name, true);
......@@ -794,8 +799,7 @@ static int ixfr_consume(knot_pkt_t *pkt, struct refresh_data *data)
uint32_t master_serial;
int ret = slave_zone_serial(data->zone, data->conf, &master_serial);
if (ret != KNOT_EOK) {
log_zone_error(data->zone->name, "Failed reading master's serial"
"from KASP DB (%s)", knot_strerror(ret));
xfr_log_read_ms(data->zone->name, ret);
return KNOT_STATE_FAIL;
}
data->xfr_type = determine_xfr_type(answer, master_serial,
......@@ -908,8 +912,7 @@ static int soa_query_consume(knot_layer_t *layer, knot_pkt_t *pkt)
uint32_t local_serial;
int ret = slave_zone_serial(data->zone, data->conf, &local_serial);
if (ret != KNOT_EOK) {
log_zone_error(data->zone->name, "Failed reading master's serial"
"from KASP DB (%s)", knot_strerror(ret));
xfr_log_read_ms(data->zone->name, ret);
return KNOT_STATE_FAIL;
}
uint32_t remote_serial = knot_soa_serial(rr->rrs.rdata);
......@@ -949,8 +952,7 @@ static int transfer_produce(knot_layer_t *layer, knot_pkt_t *pkt)
uint32_t master_serial;
ret = slave_zone_serial(data->zone, data->conf, &master_serial);
if (ret != KNOT_EOK) {
log_zone_error(data->zone->name, "Failed reading master's serial"
"from KASP DB (%s)", knot_strerror(ret));
xfr_log_read_ms(data->zone->name, ret);
}
if (sending_soa == NULL || ret != KNOT_EOK) {
knot_rrset_free(sending_soa, data->mm);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment