From ded6ccf056e9f97eb0df9657d7b1c4bffb97cc97 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Sun, 23 May 2021 02:59:08 +0200 Subject: [PATCH] Improved probing. --- .../metrics/http/HttpAccessLogAnalyzer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogAnalyzer.java b/src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogAnalyzer.java index 728309e..e46a228 100644 --- a/src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogAnalyzer.java +++ b/src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogAnalyzer.java @@ -86,9 +86,12 @@ public class HttpAccessLogAnalyzer result.putAll(this.ips.getCounters("metrics.http.ip")); result.putAll(this.ipv4.getCounters("metrics.http.ip.ipv4")); result.putAll(this.ipv6.getCounters("metrics.http.ip.ipv6")); - result.putAll(this.botIps.getCounters("metrics.http.ip.ipv6")); + result.putAll(this.botIps.getCounters("metrics.http.ip.bots")); + result.putAll(this.visitorIps.getCounters("metrics.http.ip.visitors")); result.putAll(this.visits.getCounters("metrics.http.visits")); + result.putAll(this.botVisits.getCounters("metrics.http.visits.bots")); + result.putAll(this.visitorVisits.getCounters("metrics.http.visits.visitors")); // return result; @@ -242,18 +245,19 @@ public class HttpAccessLogAnalyzer // metrics.http.visits.* = this.visits.putVisit(log); + this.visits.storeTimeMarks(year, yearMonth, yearWeek, date); if (log.isBot()) { this.botVisits.putVisit(log); + this.botVisits.storeTimeMarks(year, yearMonth, yearWeek, date); } else { this.visitorVisits.putVisit(log); + this.visitorVisits.storeTimeMarks(year, yearMonth, yearWeek, date); } - this.visits.storeTimeMarks(year, yearMonth, yearWeek, date); - // metrics.http.countries.XX = // metrics.http.errors.* =