Improved probing.

This commit is contained in:
Christian P. MOMON 2021-05-23 02:59:08 +02:00
parent 0bd23e09ab
commit ded6ccf056

View file

@ -86,9 +86,12 @@ public class HttpAccessLogAnalyzer
result.putAll(this.ips.getCounters("metrics.http.ip")); result.putAll(this.ips.getCounters("metrics.http.ip"));
result.putAll(this.ipv4.getCounters("metrics.http.ip.ipv4")); result.putAll(this.ipv4.getCounters("metrics.http.ip.ipv4"));
result.putAll(this.ipv6.getCounters("metrics.http.ip.ipv6")); 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.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; return result;
@ -242,18 +245,19 @@ public class HttpAccessLogAnalyzer
// metrics.http.visits.* = // metrics.http.visits.* =
this.visits.putVisit(log); this.visits.putVisit(log);
this.visits.storeTimeMarks(year, yearMonth, yearWeek, date);
if (log.isBot()) if (log.isBot())
{ {
this.botVisits.putVisit(log); this.botVisits.putVisit(log);
this.botVisits.storeTimeMarks(year, yearMonth, yearWeek, date);
} }
else else
{ {
this.visitorVisits.putVisit(log); this.visitorVisits.putVisit(log);
this.visitorVisits.storeTimeMarks(year, yearMonth, yearWeek, date);
} }
this.visits.storeTimeMarks(year, yearMonth, yearWeek, date);
// metrics.http.countries.XX = // metrics.http.countries.XX =
// metrics.http.errors.* = // metrics.http.errors.* =