statool/statoolinfos
statool/statoolinfos
1
0
Fork 0
Code Issues Pull requests Releases 8 Activity

Rename package from http to httpaccess.

Browse source
This commit is contained in:
Christian P. MOMON 2024-07-13 23:25:21 +02:00
parent cc545c217e
commit 3bc224b779
26 changed files with 84 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLog.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpAccessLog.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.time.LocalDateTime;
import java.time.ZoneId;

19
src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogAnalyzer.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpAccessLogAnalyzer.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2023 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2020-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.io.IOException;
import java.util.regex.Matcher;
@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
import fr.devinsy.statoolinfos.core.StatoolInfosException;
import fr.devinsy.statoolinfos.metrics.IpCounters;
import fr.devinsy.statoolinfos.metrics.PathCounters;
import fr.devinsy.strings.StringList;
/**
* The Class HttpAccessLogProber.
@ -305,9 +306,6 @@ public class HttpAccessLogAnalyzer
this.counters.inc("metrics.http.devices." + device.toString().toLowerCase(), year, yearMonth, yearWeek, date);
// metrics.http.countries.XX =
// metrics.http.errors.* =
// metrics.http.errors.php.* =
}
}
@ -367,13 +365,18 @@ public class HttpAccessLogAnalyzer
HttpAccessLogAnalyzer analyzer = new HttpAccessLogAnalyzer();
for (HttpAccessLog log : logs)
HttpAccessLogIterator logIterator = (HttpAccessLogIterator) logs.iterator();
while (logIterator.hasNext())
{
analyzer.probeLog(log);
analyzer.probeLog(logIterator.next());
}
result = analyzer.getCounters();
StringList timemarks = result.getNowTimeMarks();
analyzer.getCounters().set(logIterator.getLogCount(), "metrics.http.logs.count", timemarks);
analyzer.getCounters().set(logIterator.getIgnoredLogCount(), "metrics.http.logs.ignored", timemarks);
analyzer.getCounters().set(logIterator.getFailedLogCount(), "metrics.http.logs.failed", timemarks);
//
return result;
}

46
src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogIterator.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpAccessLogIterator.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2023 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2022-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.io.IOException;
import java.time.format.DateTimeFormatter;
@ -43,8 +43,9 @@ public class HttpAccessLogIterator implements Iterator<HttpAccessLog>
private DateTimeFormatter dateTimeFormatter;
private Pattern requestFilter;
private HttpAccessLog nextLog;
private int errorCount;
private int ignoredLineCount;
private int logCount;
private int ignoredLogCount;
private int failedLogCount;
/**
* Instantiates a new http access log iterator.
@ -92,8 +93,9 @@ public class HttpAccessLogIterator implements Iterator<HttpAccessLog>
{
this.lineIterator = new FilesLineIterator(source);
this.nextLog = null;
this.errorCount = 0;
this.ignoredLineCount = 0;
this.logCount = 0;
this.ignoredLogCount = 0;
this.failedLogCount = 0;
if (StringUtils.isBlank(linePattern))
{
@ -134,23 +136,33 @@ public class HttpAccessLogIterator implements Iterator<HttpAccessLog>
}
/**
* Gets the error count.
* Gets the failed log count.
*
* @return the error count
* @return the failed log count
*/
public int getErrorCount()
public int getFailedLogCount()
{
return this.errorCount;
return this.failedLogCount;
}
/**
* Gets the ignored line count.
* Gets the ignored log count.
*
* @return the ignored line count
* @return the ignored log count
*/
public int getIgnoredLineCount()
public int getIgnoredLogCount()
{
return this.ignoredLineCount;
return this.ignoredLogCount;
}
/**
* Gets the log count.
*
* @return the log count
*/
public int getLogCount()
{
return this.logCount;
}
/* (non-Javadoc)
@ -206,6 +218,7 @@ public class HttpAccessLogIterator implements Iterator<HttpAccessLog>
if (this.lineIterator.hasNext())
{
String line = this.lineIterator.next();
this.logCount += 1;
try
{
@ -213,7 +226,7 @@ public class HttpAccessLogIterator implements Iterator<HttpAccessLog>
if (log == null)
{
logger.warn("LINE IS NOT MATCHING [{}]", line);
this.errorCount += 1;
this.failedLogCount += 1;
}
else if ((this.requestFilter == null) || (this.requestFilter.matcher(log.getRequest()).matches()))
{
@ -222,13 +235,14 @@ public class HttpAccessLogIterator implements Iterator<HttpAccessLog>
}
else
{
this.ignoredLineCount += 1;
this.ignoredLogCount += 1;
// System.out.println("XX " + log.getRequest());
}
}
catch (Exception exception)
{
logger.warn("Error parsing line [{}][{}]", line, exception.getMessage());
this.failedLogCount += 1;
// exception.printStackTrace();
}
}

4
src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogParser.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpAccessLogParser.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2023 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2020-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;

4
src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogStat.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpAccessLogStat.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2020-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogs.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpAccessLogs.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2023 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2022-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.io.File;
import java.io.IOException;

0
src/fr/devinsy/statoolinfos/metrics/http/HttpLogIterator.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpLogIterator.java
View file

4
src/fr/devinsy/statoolinfos/metrics/http/HttpMethod.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpMethod.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2022-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
/**
* The Class HttpMethod.

4
src/fr/devinsy/statoolinfos/metrics/http/HttpStatus.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpStatus.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/fr/devinsy/statoolinfos/metrics/http/HttpStatusCategory.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpStatusCategory.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021-2022 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
/**
* The Enum HttpStatusCategory.

12
src/fr/devinsy/statoolinfos/metrics/http/HttpStatusTable.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/HttpStatusTable.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.util.HashMap;
import java.util.regex.Pattern;
@ -29,15 +29,15 @@ import org.slf4j.LoggerFactory;
*/
public class HttpStatusTable
{
private static Logger logger = LoggerFactory.getLogger(HttpStatusTable.class);
public static final Pattern HTTP_CODE_PATTERN = Pattern.compile("\\d{3}");
private static class SingletonHolder
{
private static final HttpStatusTable instance = new HttpStatusTable();
}
private static Logger logger = LoggerFactory.getLogger(HttpStatusTable.class);
public static final Pattern HTTP_CODE_PATTERN = Pattern.compile("\\d{3}");
private HashMap<Integer, HttpStatus> codes;
/**

0
src/fr/devinsy/statoolinfos/metrics/http/NGinxLogAnalyzer.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/NGinxLogAnalyzer.java
View file

4
src/fr/devinsy/statoolinfos/metrics/http/UserAgent.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/UserAgent.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;

4
src/fr/devinsy/statoolinfos/metrics/http/UserAgentBotDetector.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/UserAgentBotDetector.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.io.IOException;

4
src/fr/devinsy/statoolinfos/metrics/http/UserAgentBrowser.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/UserAgentBrowser.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
/**
* The Enum UserAgentBrowser.

4
src/fr/devinsy/statoolinfos/metrics/http/UserAgentDevice.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/UserAgentDevice.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
/**
* The Enum UserAgentDevice.

4
src/fr/devinsy/statoolinfos/metrics/http/UserAgentOS.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/UserAgentOS.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021-2022 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
/**
* The Enum UserAgentOS.

4
src/fr/devinsy/statoolinfos/metrics/http/UserAgentType.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/UserAgentType.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
/**
* The Enum UserAgentType.

4
src/fr/devinsy/statoolinfos/metrics/http/Visit.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/Visit.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.time.Duration;
import java.time.LocalDate;

4
src/fr/devinsy/statoolinfos/metrics/http/VisitCounters.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/VisitCounters.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.time.LocalDate;
import java.time.YearMonth;

4
src/fr/devinsy/statoolinfos/metrics/http/VisitorCounters.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/VisitorCounters.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.util.HashMap;

4
src/fr/devinsy/statoolinfos/metrics/http/Visits.java → src/fr/devinsy/statoolinfos/metrics/httpaccess/Visits.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2021-2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.metrics.http;
package fr.devinsy.statoolinfos.metrics.httpaccess;
import java.time.Duration;
import java.time.LocalDate;

0
src/fr/devinsy/statoolinfos/metrics/http/userAgentBotDetectorData.txt → src/fr/devinsy/statoolinfos/metrics/httpaccess/userAgentBotDetectorData.txt
View file

6
src/fr/devinsy/statoolinfos/metrics/xmpp/XmppHttpLogAnalyzer.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 Christian Pierre MOMON <christian@momon.org>
* Copyright (C) 2024 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory;
import fr.devinsy.statoolinfos.core.StatoolInfosException;
import fr.devinsy.statoolinfos.metrics.PathCounters;
import fr.devinsy.statoolinfos.metrics.UserCounters;
import fr.devinsy.statoolinfos.metrics.http.HttpAccessLog;
import fr.devinsy.statoolinfos.metrics.http.HttpAccessLogIterator;
import fr.devinsy.statoolinfos.metrics.httpaccess.HttpAccessLog;
import fr.devinsy.statoolinfos.metrics.httpaccess.HttpAccessLogIterator;
import fr.devinsy.statoolinfos.util.Files;
/**

0
test/fr/devinsy/statoolinfos/metrics/http/UserAgentBotDetectorTest.java → test/fr/devinsy/statoolinfos/metrics/httpaccess/UserAgentBotDetectorTest.java
View file

0
test/fr/devinsy/statoolinfos/metrics/http/VisitCountersTest.java → test/fr/devinsy/statoolinfos/metrics/httpaccess/VisitCountersTest.java
View file