From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH 5/5] ids-functions.pl: Do not longer call any log message as "ERROR".
Date: Tue, 22 Mar 2022 20:40:59 +0100
Message-ID: <20220322194059.3030-5-stefan.schantl@ipfire.org>
In-Reply-To: <20220322194059.3030-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3738965642617501641=="
List-Id: <development.lists.ipfire.org>

--===============3738965642617501641==
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 | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index d7df41dd1..9eb375bc9 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -226,7 +226,7 @@ sub checkdiskspace () {
 			# Check if the available disk space is more than 300MB.
 			if ($available < 300) {
 				# Log error to syslog.
-				&_log_to_syslog("Not enough free disk space on /var. Only $available MB =
from 300 MB available.");
+				&_log_to_syslog("<ERROR> Not enough free disk space on /var. Only $avail=
able MB from 300 MB available.");
=20
 				# Exit function and return "1" - False.
 				return 1;
@@ -270,7 +270,7 @@ sub downloadruleset ($) {
 	# Check if a ruleset has been configured.
 	unless(%used_providers) {
 		# Log that no ruleset has been configured and abort.
-		&_log_to_syslog("No ruleset provider has been configured.");
+		&_log_to_syslog("<ERROR> No ruleset provider has been configured.");
=20
 		# Return "1".
 		return 1;
@@ -333,7 +333,7 @@ sub downloadruleset ($) {
 	# Loop through the hash of sheduled providers.
 	foreach my $provider ( keys %sheduled_providers) {
 		# Log download/update of the ruleset.
-		&_log_to_syslog("Downloading ruleset for provider: $provider.");
+		&_log_to_syslog("<INFO> Downloading ruleset for provider: $provider.");
=20
 		# Grab the download url for the provider.
 		my $url =3D $IDS::Ruleset::Providers{$provider}{'dl_url'};
@@ -354,7 +354,7 @@ sub downloadruleset ($) {
 		# Abort if no url could be determined for the provider.
 		unless ($url) {
 			# Log error and abort.
-			&_log_to_syslog("Unable to gather a download URL for the selected ruleset=
 provider.");
+			&_log_to_syslog("<ERROR> Unable to gather a download URL for the selected=
 ruleset provider.");
 			return 1;
 		}
=20
@@ -400,7 +400,7 @@ sub downloadruleset ($) {
 			# Check if the server responds with 304 (Not Modified).
 			} elsif ($response->code =3D=3D 304) {
 				# Log to syslog.
-				&_log_to_syslog("Ruleset is up-to-date, no update required.");
+				&_log_to_syslog("<INFO> Ruleset is up-to-date, no update required.");
=20
 				# Nothing to be done, the ruleset is up-to-date.
 				return;
@@ -411,7 +411,7 @@ sub downloadruleset ($) {
 				my $error =3D $response->content;
=20
 				# Log error message.
-				&_log_to_syslog("Unable to download the ruleset. \($error\)");
+				&_log_to_syslog("<ERROR> Unable to download the ruleset. \($error\)");
=20
 				# Return "1" - false.
 				return 1;
@@ -446,8 +446,8 @@ sub downloadruleset ($) {
 		# Check if both file sizes match.
 		if (($remote_filesize) && ($remote_filesize ne $local_filesize)) {
 			# Log error message.
-			&_log_to_syslog("Unable to completely download the ruleset. ");
-			&_log_to_syslog("Only got $local_filesize Bytes instead of $remote_filesi=
ze Bytes. ");
+			&_log_to_syslog("<ERROR> Unable to completely download the ruleset. ");
+			&_log_to_syslog("<ERROR> Only got $local_filesize Bytes instead of $remot=
e_filesize Bytes. ");
=20
 			# Delete temporary file.
 			unlink("$tmpfile");
@@ -459,7 +459,7 @@ sub downloadruleset ($) {
 		# Check if a file name could be obtained.
 		unless ($dl_rulesfile) {
 			# Log error message.
-			&_log_to_syslog("Unable to store the downloaded rules file. ");
+			&_log_to_syslog("<ERROR> Unable to store the downloaded rules file. ");
=20
 			# Delete downloaded temporary file.
 			unlink("$tmpfile");
@@ -518,7 +518,7 @@ sub extractruleset ($) {
=20
 	# Check if the file exists.
 	unless (-f $tarball) {
-		&_log_to_syslog("Could not find ruleset file: $tarball");
+		&_log_to_syslog("<ERROR> Could not find ruleset file: $tarball");
=20
 		# Return nothing.
 		return;
@@ -897,7 +897,7 @@ sub _log_to_syslog ($) {
=20
 	# The syslog function works best with an array based input,
 	# so generate one before passing the message details to syslog.
-	my @syslog =3D ("ERR", "<ERROR> $message");
+	my @syslog =3D ("ERR", "$message");
=20
 	# Establish the connection to the syslog service.
 	openlog('oinkmaster', 'cons,pid', 'user');
--=20
2.30.2


--===============3738965642617501641==--