From 282e3fe4fb6c71942ac37c925ad541f14973365f Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Wed, 8 Mar 2023 15:59:55 +0100 Subject: [PATCH] log.dat: Fixes Bug#12922 - adjusts regex to catch hostname for hostname or FQDN - Most of the packages being searched for in the system logs section only put hostname into the logs. However HAProxy puts the FQDN. Reviewing RFC 5424 shows that this is following the requirements. The preferred order fromn the RFC is 1. FQDN 2. Static IP address 3. hostname 4. Dynamic IP address 5. the NILVALUE - Most of the programs are using option 3 but option 1 is valid for HAProxy - The regex change filters out the hostname from the FQDN if an extra 'dot' is present Fixes: Bug#12922 Suggested-by: Michael Tested-by: Michael Signed-off-by: Adolf Belka --- html/cgi-bin/logs.cgi/log.dat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index d3f2599f88..53b9073fc7 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -231,7 +231,7 @@ while ($gzindex >=0 && $loop) { #&General::log("reading $filestr"); READ:while () { my $line = $_; - if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w\-]+ ${section}(.*)/) { + if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w\-\.]+ ${section}(.*)/) { # when standard viewing, just keep in memory the correct slice # it starts a '$start' and size is $viewport # If export, then keep all lines... @@ -276,7 +276,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}) foreach $_ (@log) { - /^... (..) (..:..:..) [\w\-]+ ${section}(.*)$/; + /^... (..) (..:..:..) [\w\-\.]+ ${section}(.*)$/; my $day = $1; $day =~ tr / /0/; my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ; @@ -399,7 +399,7 @@ $lines = 0; #print ''; foreach $_ (@log) { - /^... (..) (..:..:..) [\w\-]+ ${section}(.*)$/; + /^... (..) (..:..:..) [\w\-\.]+ ${section}(.*)$/; my $day = $1; $day =~ tr / /0/; my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ; -- 2.39.5