From: pcarana <pc.moreno2099@gmail.com>
Date: Tue, 4 Feb 2020 17:30:59 +0000 (-0600)
Subject: Downgrade some RRDP log messages to avoid logs overhead.
X-Git-Tag: v1.2.0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c46b80b727735d3b40821a1270505bb67513c2f;p=thirdparty%2FFORT-validator.git

Downgrade some RRDP log messages to avoid logs overhead.
---

diff --git a/src/object/certificate.c b/src/object/certificate.c
index 6dd1b690..1fbf3259 100644
--- a/src/object/certificate.c
+++ b/src/object/certificate.c
@@ -1960,15 +1960,15 @@ use_access_method(struct sia_ca_uris *sia_uris,
 
 	if (primary_rrdp) {
 		if (error != -EPERM)
-			pr_warn("Couldn't fetch data from RRDP repository '%s', trying to fetch data now from '%s'.",
+			pr_info("Couldn't fetch data from RRDP repository '%s', trying to fetch data now from '%s'.",
 			    uri_get_global(sia_uris->rpkiNotify.uri),
 			    uri_get_global(sia_uris->caRepository.uri));
 		else
-			pr_debug("RRDP repository '%s' download/processing returned error previously, now I will try to fetch data from '%s'.",
+			pr_info("RRDP repository '%s' download/processing returned error previously, now I will try to fetch data from '%s'.",
 			    uri_get_global(sia_uris->rpkiNotify.uri),
 			    uri_get_global(sia_uris->caRepository.uri));
 	} else {
-		pr_warn("Couldn't fetch data from repository '%s', trying to fetch data now from RRDP '%s'.",
+		pr_info("Couldn't fetch data from repository '%s', trying to fetch data now from RRDP '%s'.",
 		    uri_get_global(sia_uris->caRepository.uri),
 		    uri_get_global(sia_uris->rpkiNotify.uri));
 	}
diff --git a/src/rrdp/rrdp_loader.c b/src/rrdp/rrdp_loader.c
index 592e19f3..304218de 100644
--- a/src/rrdp/rrdp_loader.c
+++ b/src/rrdp/rrdp_loader.c
@@ -166,7 +166,7 @@ rrdp_load(struct rpki_uri *uri)
 			break;
 		}
 		/* Something went wrong, use snapshot */
-		pr_warn("There was an error processing RRDP deltas, using the snapshot instead.");
+		pr_info("There was an error processing RRDP deltas, using the snapshot instead.");
 	case RRDP_URI_NOTFOUND:
 		error = process_snapshot(upd_notification, &visited);
 		if (error)
diff --git a/src/rrdp/rrdp_parser.c b/src/rrdp/rrdp_parser.c
index 142b3519..adb4c8d4 100644
--- a/src/rrdp/rrdp_parser.c
+++ b/src/rrdp/rrdp_parser.c
@@ -540,8 +540,9 @@ parse_publish(xmlTextReaderPtr reader, bool parse_hash, bool hash_required,
 		    tmp->doc_data.hash_len);
 		uri_refput(uri);
 		if (error != 0) {
-			error = pr_err("Hash of base64 decoded element from URI '%s' doesn't match <publish> element hash",
+			pr_info("Hash of base64 decoded element from URI '%s' doesn't match <publish> element hash",
 			    tmp->doc_data.uri);
+			error = EINVAL;
 			goto release_base64;
 		}
 	}