From 5e1f2d68d42551b580d201b6ceb846d8c7a15cad Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Wed, 24 Feb 2021 14:56:32 +0100
Subject: [PATCH] Improved access log pattern.

---
 .../statoolinfos/metrics/http/HttpAccessLogAnalyzer.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogAnalyzer.java b/src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogAnalyzer.java
index 8ec0008..a4497fb 100644
--- a/src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogAnalyzer.java
+++ b/src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogAnalyzer.java
@@ -175,7 +175,7 @@ public class HttpAccessLogAnalyzer
                 this.counters.inc("metrics.http.pages", year, yearMonth, yearWeek, date);
             }
 
-            // metrics.http.status.XXX
+            // metrics.http.status.XXXX
             String status = String.valueOf(log.getStatus().getCode());
             this.counters.inc("metrics.http.status." + status, year, yearMonth, yearWeek, date);
 
@@ -262,7 +262,7 @@ public class HttpAccessLogAnalyzer
         // log_format combined '$remote_addr - $remote_user [$time_local] '
         // '"$request" $status $body_bytes_sent '
         // '"$http_referer" "$http_user_agent"';
-        String combinedPattern = "^(?<remoteAddress>[a-zA-F0-9\\\\:\\\\.]+) - (?<remoteUser>\\S+) \\[(?<time>[^\\]]+)\\] \"(?<request>[^\"]*)\" (?<status>\\d+) (?<bodyBytesSent>\\d+) \"(?<referer>[^\"]*)\" \"(?<userAgent>[^\"]*)\".*$";
+        String combinedPattern = "^(?<remoteAddress>[a-zA-F0-9\\\\:\\\\.]+) - (?<remoteUser>[^\\[]+) \\[(?<time>[^\\]]+)\\] \"(?<request>[^\"]*)\" (?<status>\\d+) (?<bodyBytesSent>\\d+) \"(?<referer>[^\"]*)\" \"(?<userAgent>[^\"]*)\".*$";
 
         Pattern pattern = Pattern.compile(combinedPattern);