Skip to content
Snippets Groups Projects
Commit 71d868ec authored by Jan Včelák's avatar Jan Včelák :rocket:
Browse files

logging: comma after DNSSEC category

parent 267aacf3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/knot/dnssec/zone-events.c
+ 11
− 11
View file @ 71d868ec
......@@ -44,7 +44,7 @@ static int init_dnssec_structs(const zone_contents_t *zone,
zone->apex->owner,
nsec3_enabled, zone_keys);
if (result != KNOT_EOK) {
log_zone_error(zone->apex->owner, "DNSSEC: failed to load keys: %s",
log_zone_error(zone->apex->owner, "DNSSEC, failed to load keys: %s",
knot_strerror(result));
knot_free_zone_keys(zone_keys);
return result;
......@@ -72,7 +72,7 @@ static int zone_sign(zone_contents_t *zone, const conf_zone_t *zone_config,
const knot_dname_t *zone_name = zone->apex->owner;
log_zone_info(zone_name, "DNSSEC: signing started");
log_zone_info(zone_name, "DNSSEC, signing started");
uint32_t new_serial = zone_contents_next_serial(zone, zone_config->serial_policy);
dbg_dnssec_verb("changeset empty before generating NSEC chain: %d\n",
......@@ -92,7 +92,7 @@ static int zone_sign(zone_contents_t *zone, const conf_zone_t *zone_config,
result = knot_zone_create_nsec_chain(zone, out_ch,
&zone_keys, &policy);
if (result != KNOT_EOK) {
log_zone_error(zone_name, "DNSSEC: could not create NSEC(3) chain: %s",
log_zone_error(zone_name, "DNSSEC, could not create NSEC(3) chain: %s",
knot_strerror(result));
knot_free_zone_keys(&zone_keys);
return result;
......@@ -104,7 +104,7 @@ static int zone_sign(zone_contents_t *zone, const conf_zone_t *zone_config,
result = knot_zone_sign(zone, &zone_keys, &policy, out_ch,
refresh_at);
if (result != KNOT_EOK) {
log_zone_error(zone_name, "DNSSEC: error while signing: %s",
log_zone_error(zone_name, "DNSSEC, error while signing: %s",
knot_strerror(result));
knot_free_zone_keys(&zone_keys);
return result;
......@@ -115,7 +115,7 @@ static int zone_sign(zone_contents_t *zone, const conf_zone_t *zone_config,
// Check if only SOA changed
if (changeset_empty(out_ch) &&
!knot_zone_sign_soa_expired(zone, &zone_keys, &policy)) {
log_zone_info(zone_name, "DNSSEC: no signing performed, zone is valid");
log_zone_info(zone_name, "DNSSEC, no signing performed, zone is valid");
knot_free_zone_keys(&zone_keys);
assert(changeset_empty(out_ch));
return KNOT_EOK;
......@@ -128,7 +128,7 @@ static int zone_sign(zone_contents_t *zone, const conf_zone_t *zone_config,
result = knot_zone_sign_update_soa(&soa, &rrsigs, &zone_keys, &policy,
new_serial, out_ch);
if (result != KNOT_EOK) {
log_zone_error(zone_name, "DNSSEC: not signing, cannot update "
log_zone_error(zone_name, "DNSSEC, not signing, cannot update "
"SOA record: %s", knot_strerror(result));
knot_free_zone_keys(&zone_keys);
return result;
......@@ -138,7 +138,7 @@ static int zone_sign(zone_contents_t *zone, const conf_zone_t *zone_config,
dbg_dnssec_detail("zone signed: changes=%zu\n",
changeset_size(out_ch));
log_zone_info(zone_name, "DNSSEC: successfully signed");
log_zone_info(zone_name, "DNSSEC, successfully signed");
return KNOT_EOK;
}
......@@ -195,7 +195,7 @@ int knot_dnssec_sign_changeset(const zone_contents_t *zone,
ret = knot_zone_sign_changeset(zone, in_ch, out_ch,
&zone_keys, &policy);
if (ret != KNOT_EOK) {
log_zone_error(zone_name, "DNSSEC: failed to sign changeset: %s",
log_zone_error(zone_name, "DNSSEC, failed to sign changeset: %s",
knot_strerror(ret));
knot_free_zone_keys(&zone_keys);
return ret;
......@@ -204,7 +204,7 @@ int knot_dnssec_sign_changeset(const zone_contents_t *zone,
// Create NSEC(3) chain
ret = knot_zone_create_nsec_chain(zone, out_ch, &zone_keys, &policy);
if (ret != KNOT_EOK) {
log_zone_error(zone_name, "DNSSEC: failed to create NSEC(3) chain: %s",
log_zone_error(zone_name, "DNSSEC, failed to create NSEC(3) chain: %s",
knot_strerror(ret));
knot_free_zone_keys(&zone_keys);
return ret;
......@@ -214,7 +214,7 @@ int knot_dnssec_sign_changeset(const zone_contents_t *zone,
ret = knot_zone_sign_nsecs_in_changeset(&zone_keys, &policy,
out_ch);
if (ret != KNOT_EOK) {
log_zone_error(zone_name, "DNSSEC: failed to sign changeset: %s",
log_zone_error(zone_name, "DNSSEC, failed to sign changeset: %s",
knot_strerror(ret));
knot_free_zone_keys(&zone_keys);
return ret;
......@@ -226,7 +226,7 @@ int knot_dnssec_sign_changeset(const zone_contents_t *zone,
ret = knot_zone_sign_update_soa(&soa, &rrsigs, &zone_keys, &policy,
new_serial, out_ch);
if (ret != KNOT_EOK) {
log_zone_error(zone_name, "DNSSEC: failed to sign SOA RR: %s",
log_zone_error(zone_name, "DNSSEC, failed to sign SOA RR: %s",
knot_strerror(ret));
knot_free_zone_keys(&zone_keys);
return ret;
......
src/knot/dnssec/zone-keys.c
+ 5
− 5
View file @ 71d868ec
......@@ -158,7 +158,7 @@ int knot_load_zone_keys(const char *keydir_name, const knot_dname_t *zone_name,
free(path);
if (ret != KNOT_EOK) {
log_zone_warning(zone_name, "DNSSEC: failed to load key '%s': %s",
log_zone_warning(zone_name, "DNSSEC, failed to load key '%s': %s",
entry->d_name, knot_strerror(ret));
knot_free_key_params(&params);
continue;
......@@ -189,7 +189,7 @@ int knot_load_zone_keys(const char *keydir_name, const knot_dname_t *zone_name,
if (!knot_dnssec_algorithm_is_zonesign(params.algorithm,
nsec3_enabled)
) {
log_zone_notice(zone_name, "DNSSEC: ignoring key %d (%s): "
log_zone_notice(zone_name, "DNSSEC, ignoring key %d (%s): "
"incompatible algorithm",
params.keytag, entry->d_name);
knot_free_key_params(&params);
......@@ -198,7 +198,7 @@ int knot_load_zone_keys(const char *keydir_name, const knot_dname_t *zone_name,
}
if (knot_get_zone_key(keys, params.keytag) != NULL) {
log_zone_notice(zone_name, "DNSSEC: ignoring key %d (%s): "
log_zone_notice(zone_name, "DNSSEC, ignoring key %d (%s): "
"duplicate keytag",
params.keytag, entry->d_name);
knot_free_key_params(&params);
......@@ -208,7 +208,7 @@ int knot_load_zone_keys(const char *keydir_name, const knot_dname_t *zone_name,
ret = knot_dnssec_key_from_params(&params, &key->dnssec_key);
if (ret != KNOT_EOK) {
log_zone_error(zone_name, "DNSSEC: failed to process "
log_zone_error(zone_name, "DNSSEC, failed to process "
"key %d (%s): %s",
params.keytag, entry->d_name,
knot_strerror(ret));
......@@ -217,7 +217,7 @@ int knot_load_zone_keys(const char *keydir_name, const knot_dname_t *zone_name,
continue;
}
log_zone_info(zone_name, "DNSSEC: loaded key %5d, file %s, %s, %s, %s",
log_zone_info(zone_name, "DNSSEC, loaded key %5d, file %s, %s, %s, %s",
params.keytag, entry->d_name,
key->is_ksk ? "KSK" : "ZSK",
key->is_active ? "active" : "inactive",
......
src/knot/zone/events.c
+ 5
− 5
View file @ 71d868ec
......@@ -212,7 +212,7 @@ static void schedule_dnssec(zone_t *zone, time_t refresh_at)
struct tm time_gm = { 0 };
localtime_r(&refresh_at, &time_gm);
strftime(time_str, sizeof(time_str), KNOT_LOG_TIME_FORMAT, &time_gm);
log_zone_info(zone->name, "DNSSEC: next signing on %s", time_str);
log_zone_info(zone->name, "DNSSEC, next signing on %s", time_str);
// schedule
......@@ -494,14 +494,14 @@ static int event_dnssec(zone_t *zone)
uint32_t refresh_at = time(NULL);
if (zone->flags & ZONE_FORCE_RESIGN) {
log_zone_info(zone->name, "DNSSEC: dropping previous "
log_zone_info(zone->name, "DNSSEC, dropping previous "
"signatures, resigning zone");
zone->flags &= ~ZONE_FORCE_RESIGN;
ret = knot_dnssec_zone_sign_force(zone->contents, zone->conf,
&ch, &refresh_at);
} else {
log_zone_info(zone->name, "DNSSEC: signing zone");
log_zone_info(zone->name, "DNSSEC, signing zone");
ret = knot_dnssec_zone_sign(zone->contents, zone->conf,
&ch, KNOT_SOA_SERIAL_UPDATE,
&refresh_at);
......@@ -515,7 +515,7 @@ static int event_dnssec(zone_t *zone)
zone_contents_t *new_contents = NULL;
int ret = apply_changeset(zone, &ch, &new_contents);
if (ret != KNOT_EOK) {
log_zone_error(zone->name, "DNSSEC: could not sign zone (%s)",
log_zone_error(zone->name, "DNSSEC, could not sign zone (%s)",
knot_strerror(ret));
goto done;
}
......@@ -523,7 +523,7 @@ static int event_dnssec(zone_t *zone)
/* Write change to journal. */
ret = zone_change_store(zone, &ch);
if (ret != KNOT_EOK) {
log_zone_error(zone->name, "DNSSEC: could not sign zone (%s)",
log_zone_error(zone->name, "DNSSEC, could not sign zone (%s)",
knot_strerror(ret));
update_rollback(&ch);
update_free_zone(&new_contents);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment