Support for date found in error log files.

diff --git a/tools/logresolvemerge.pl b/tools/logresolvemerge.pl
index 771b089584d5e7a3b8e6b1ac1cd4ce058e5e3486..4dd72d0b2f7bd80efc2b389db9722c3e9f149e58 100644 (file)
--- a/tools/logresolvemerge.pl
+++ b/tools/logresolvemerge.pl
@@ -334,6 +334,8 @@ while (1 == 1)
                                my $year=0; my $month=0; my $day=0; my $hour=0; my $minute=0; my $second=0;
                                if ($_ =~ /(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/) { $year=$1; $month=$2; $day=$3; $hour=$4; $minute=$5; $second=$6; }
                                if ($_ =~ /\[(\d\d)[\/:\s](\w+)[\/:\s](\d\d\d\d)[\/:\s](\d\d)[\/:\s](\d\d)[\/:\s](\d\d) /) { $year=$3; $month=$2; $day=$1; $hour=$4; $minute=$5; $second=$6; }
+                               if ($_ =~ /\[\w+ (\w+) (\d\d) (\d\d)[\/:\s](\d\d)[\/:\s](\d\d) (\d\d\d\d)\]/) { $year=$6; $month=$1; $day=$2; $hour=$3; $minute=$4; $second=$5; }\r
+
                                if ($monthnum{$month}) { $month=$monthnum{$month}; }    # Change lib month in num month if necessary
 
                                # Create $timerecord like YYYYMMDDHHMMSS