From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/5] ids-functions.pl: Allow "5" download attempts for each
 provider before fail.
Date: Tue, 22 Mar 2022 20:40:56 +0100
Message-ID: <20220322194059.3030-2-stefan.schantl@ipfire.org>
In-Reply-To: <20220322194059.3030-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9134243099972356974=="
List-Id: <development.lists.ipfire.org>

--===============9134243099972356974==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/cfgroot/ids-functions.pl | 38 ++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index eb276030b..c8bc52b1b 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -256,6 +256,10 @@ sub downloadruleset ($) {
 	# If no provider is given default to "all".
 	$provider //=3D 'all';
=20
+	# The amount of download attempts before giving up and
+	# logging an error.
+	my $max_dl_attempts =3D 5;
+
 	# Hash to store the providers and access id's, for which rules should be do=
wnloaded.
 	my %sheduled_providers =3D ();
=20
@@ -364,19 +368,33 @@ sub downloadruleset ($) {
 		# Pass the requested url to the downloader.
 		my $request =3D HTTP::Request->new(GET =3D> $url);
=20
-		# Perform the request and save the output into the tmpfile.
-		my $response =3D $downloader->request($request, $tmpfile);
+		my $dl_attempt =3D 1;
+		my $response;
=20
-		# Check if there was any error.
-		unless ($response->is_success) {
-			# Obtain error.
-			my $error =3D $response->content;
+		# Download and retry on failure.
+		while ($dl_attempt <=3D $max_dl_attempts) {
+			# Perform the request and save the output into the tmpfile.
+			$response =3D $downloader->request($request, $tmpfile);
=20
-			# Log error message.
-			&_log_to_syslog("Unable to download the ruleset. \($error\)");
+			# Check if the download was successfull.
+			if($response->is_success) {
+				# Break loop.
+				last;
=20
-			# Return "1" - false.
-			return 1;
+			# Check if we ran out of download re-tries.
+			} elsif ($dl_attempt eq $max_dl_attempts) {
+				# Obtain error.
+				my $error =3D $response->content;
+
+				# Log error message.
+				&_log_to_syslog("Unable to download the ruleset. \($error\)");
+
+				# Return "1" - false.
+				return 1;
+			}
+
+			# Increase download attempt counter.
+			$dl_attempt++;
 		}
=20
 		# Obtain the connection headers.
--=20
2.30.2


--===============9134243099972356974==--