eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-18 11:49:09 +00:00
Code Activity

relax Apache log analysis by issuing warnings for unparseable dates instead of aborting

Browse Source
This commit is contained in:
Axel Uhl
2019-12-13 12:17:09 +01:00
parent 1e12367979
commit a491f2b430
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse/src/com/sap/sse/util/apachelog/LogEntry.java
+11 -1
View File
@@ -5,6 +5,7 @@ import java.net.UnknownHostException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Iterator;
import java.util.logging.Logger;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util;
@@ -21,6 +22,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint;
*
*/
public class LogEntry {
private static final Logger logger = Logger.getLogger(LogEntry.class.getName());
private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MMM/yyyy:HH:mm:ss ZZZZZ");
private final String hostname;
@@ -79,7 +81,15 @@ public class LogEntry {
* "15/Dec/2017:16:49:41 +0000" will result in "15/Dec/2017".
*/
public String getDateString() {
return getTimestampString().substring(0, getTimestampString().indexOf(':'));
final String result;
final int indexOfColon = getTimestampString().indexOf(':');
if (indexOfColon < 0) {
logger.warning("Couldn't find : as date separator in what was expected to be a date string: "+getTimestampString());
result = null;
} else {
result = getTimestampString().substring(0, indexOfColon);
}
return result;
}
public TimePoint getTimepoint() throws ParseException {
java/com.sap.sse/src/com/sap/sse/util/apachelog/UniqueIPsPerReferrer.java
+6 -1
View File
@@ -341,7 +341,12 @@ public class UniqueIPsPerReferrer {
final LogEntry entry = new LogEntry(line);
final String hostname = entry.getHostname();
final Writer fileWriterForHostname = getFileWriter(hostname, fileWritersPerHostname, this::getHostnameSpecificFile, /* gzipCompressed */ false, /* append */ true);
fileWriterForHostname.write(entry.getRequestorIpString()+" "+entry.getDateString()+" "+entry.getUserAgent()+"\n");
final String dateString = entry.getDateString();
final String requestorIpString = entry.getRequestorIpString();
final String userAgent = entry.getUserAgent();
if (dateString != null && requestorIpString != null && userAgent != null) {
fileWriterForHostname.write(requestorIpString+" "+dateString+" "+userAgent+"\n");
}
}
for (final Writer fw : fileWritersPerHostname.values()) {
fw.close();