From: pcarana <pc.moreno2099@gmail.com>
Date: Wed, 15 Jan 2020 17:43:17 +0000 (-0600)
Subject: Display errored URI at some log messages.
X-Git-Tag: v1.2.0~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=397a27bdaa9227271a15712afa9254ee6772eed3;p=thirdparty%2FFORT-validator.git

Display errored URI at some log messages.
---

diff --git a/src/rrdp/rrdp_parser.c b/src/rrdp/rrdp_parser.c
index 861ad929..7cedf2e8 100644
--- a/src/rrdp/rrdp_parser.c
+++ b/src/rrdp/rrdp_parser.c
@@ -130,11 +130,12 @@ download_file(struct rpki_uri *uri, long last_update)
 			return error;
 
 		if (retries == config_get_rrdp_retry_count()) {
-			pr_info("Max RRDP retries (%u) reached, won't retry again.",
-			    retries);
+			pr_info("Max RRDP retries (%u) reached fetching '%s', won't retry again.",
+			    retries, uri_get_global(uri));
 			return error;
 		}
-		pr_info("Retrying RRDP file download in %u seconds, %u attempts remaining.",
+		pr_info("Retrying RRDP file download '%s' in %u seconds, %u attempts remaining.",
+		    uri_get_global(uri),
 		    config_get_rrdp_retry_interval(),
 		    config_get_rrdp_retry_count() - retries);
 		retries++;
diff --git a/src/rsync/rsync.c b/src/rsync/rsync.c
index a6bddc4c..b5ca54bd 100644
--- a/src/rsync/rsync.c
+++ b/src/rsync/rsync.c
@@ -377,11 +377,12 @@ do_rsync(struct rpki_uri *uri, bool is_ta)
 			if (!error)
 				return 0;
 			if (retries == config_get_rsync_retry_count()) {
-				pr_info("Max RSYNC retries (%u) reached, won't retry again.",
-				    retries);
+				pr_info("Max RSYNC retries (%u) reached on '%s', won't retry again.",
+				    retries, uri_get_global(uri));
 				return error;
 			}
-			pr_info("Retrying RSYNC in %u seconds, %u attempts remaining.",
+			pr_info("Retrying RSYNC '%s' in %u seconds, %u attempts remaining.",
+			    uri_get_global(uri),
 			    config_get_rsync_retry_interval(),
 			    config_get_rsync_retry_count() - retries);
 			retries++;
diff --git a/src/xml/relax_ng.c b/src/xml/relax_ng.c
index 9988e444..5206d566 100644
--- a/src/xml/relax_ng.c
+++ b/src/xml/relax_ng.c
@@ -56,7 +56,7 @@ relax_ng_parse(const char *path, xml_read_cb cb, void *arg)
 
 	reader = xmlNewTextReaderFilename(path);
 	if (reader == NULL)
-		return pr_err("Couldn't get XML reader.");
+		return pr_err("Couldn't get XML '%s' file.", path);
 
 	error = xmlTextReaderRelaxNGSetSchema(reader, schema);
 	if (error) {