Merge pull request #145 from DSheirer/114-CSV-logging-issue

Resolves #114 issue with event log entries missing single quotes around date and time values.
This commit is contained in:
Denny Sheirer
2017-01-28 10:56:55 -05:00
committed by GitHub
2 changed files with 115 additions and 110 deletions

View File

@@ -30,7 +30,8 @@ public abstract class CallEvent implements Comparable<CallEvent>
protected long mEventStart = System.currentTimeMillis(); protected long mEventStart = System.currentTimeMillis();
protected long mEventEnd; protected long mEventEnd;
private SimpleDateFormat mSDF = new SimpleDateFormat("yyyyMMdd','HHmmss"); private SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyyMMdd");
private SimpleDateFormat TIME_FORMATTER = new SimpleDateFormat("HHmmss");
protected DecoderType mDecoderType; protected DecoderType mDecoderType;
protected CallEventType mCallEventType; protected CallEventType mCallEventType;
@@ -176,15 +177,23 @@ public abstract class CallEvent implements Comparable<CallEvent>
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("'"); sb.append("'");
sb.append(mSDF.format(new Date(getEventStartTime())));
Date eventStart = new Date(getEventStartTime());
sb.append(DATE_FORMATTER.format(eventStart));
sb.append("','");
sb.append(TIME_FORMATTER.format(eventStart));
sb.append("','"); sb.append("','");
if(mEventEnd != 0) if(mEventEnd != 0)
{ {
sb.append(mSDF.format(new Date(getEventEndTime()))); Date eventEnd = new Date(getEventEndTime());
sb.append(DATE_FORMATTER.format(eventEnd));
sb.append("','");
sb.append(TIME_FORMATTER.format(eventEnd));
sb.append("','");
} }
else else
{ {
sb.append("','"); sb.append("','',");
} }
sb.append("','"); sb.append("','");
sb.append(getDecoderType().toString()); sb.append(getDecoderType().toString());

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,15 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module.log; package module.log;
import module.Module;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import util.TimeStamp;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@@ -26,29 +32,19 @@ import java.io.Writer;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import module.Module;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import util.TimeStamp;
public abstract class EventLogger extends Module public abstract class EventLogger extends Module
{ {
private final static Logger mLog = private final static Logger mLog = LoggerFactory.getLogger(EventLogger.class);
LoggerFactory.getLogger( EventLogger.class );
/* Illegal filename characters */ private static final String[] ILLEGAL_FILENAME_CHARACTERS = {"#", "%", "&", "{", "}", "\\", "<", ">",
private static final String[] mIllegalCharacters = "*", "?", "/", " ", "$", "!", "'", "\"", ":", "@", "+", "`", "|", "="};
{ "#", "%", "&", "{", "}", "\\", "<", ">", "*", "?", "/",
" ", "$", "!", "'", "\"", ":", "@", "+", "`", "|", "=" };
private Path mLogDirectory; private Path mLogDirectory;
private String mFileNameSuffix; private String mFileNameSuffix;
private String mLogFileName; private String mLogFileName;
protected Writer mLogFile; protected Writer mLogFile;
public EventLogger( Path logDirectory, String fileNameSuffix ) public EventLogger(Path logDirectory, String fileNameSuffix)
{ {
mLogDirectory = logDirectory; mLogDirectory = logDirectory;
mFileNameSuffix = fileNameSuffix; mFileNameSuffix = fileNameSuffix;
@@ -56,7 +52,7 @@ public abstract class EventLogger extends Module
public String toString() public String toString()
{ {
if( mLogFileName != null ) if(mLogFileName != null)
{ {
return mLogFileName; return mLogFileName;
} }
@@ -69,30 +65,30 @@ public abstract class EventLogger extends Module
public abstract String getHeader(); public abstract String getHeader();
@Override @Override
public void start( ScheduledExecutorService executor ) public void start(ScheduledExecutorService executor)
{ {
if( mLogFile == null ) if(mLogFile == null)
{ {
try try
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append( mLogDirectory ); sb.append(mLogDirectory);
sb.append( File.separator ); sb.append(File.separator);
sb.append( TimeStamp.getTimeStamp( "_" ) ); sb.append(TimeStamp.getTimeStamp("_"));
sb.append( "_" ); sb.append("_");
sb.append( replaceIllegalCharacters( mFileNameSuffix ) ); sb.append(replaceIllegalCharacters(mFileNameSuffix));
mLogFileName = sb.toString(); mLogFileName = sb.toString();
mLog.info( "Creating log file:" + mLogFileName ); mLog.info("Creating log file:" + mLogFileName);
mLogFile = new OutputStreamWriter(new FileOutputStream( mLogFileName ) ); mLogFile = new OutputStreamWriter(new FileOutputStream(mLogFileName));
write( getHeader() ); write(getHeader());
} }
catch (FileNotFoundException e) catch(FileNotFoundException e)
{ {
mLog.error("Couldn't create log file in directory:" + mLogDirectory ); mLog.error("Couldn't create log file in directory:" + mLogDirectory);
} }
} }
} }
@@ -100,11 +96,11 @@ public abstract class EventLogger extends Module
/** /**
* Replaces any illegal filename characters in the proposed filename * Replaces any illegal filename characters in the proposed filename
*/ */
private String replaceIllegalCharacters( String filename ) private String replaceIllegalCharacters(String filename)
{ {
for( String illegalCharacter: mIllegalCharacters ) for(String illegalCharacter : ILLEGAL_FILENAME_CHARACTERS)
{ {
filename = filename.replace( illegalCharacter, "_" ); filename = filename.replace(illegalCharacter, "_");
} }
return filename; return filename;
@@ -112,7 +108,7 @@ public abstract class EventLogger extends Module
public void stop() public void stop()
{ {
if( mLogFile != null ) if(mLogFile != null)
{ {
try try
{ {
@@ -120,23 +116,23 @@ public abstract class EventLogger extends Module
mLogFile.close(); mLogFile.close();
mLogFile = null; mLogFile = null;
} }
catch( Exception e ) catch(Exception e)
{ {
mLog.error( "Couldn't close log file:" + mFileNameSuffix ); mLog.error("Couldn't close log file:" + mFileNameSuffix);
} }
} }
} }
protected void write( String eventLogEntry ) protected void write(String eventLogEntry)
{ {
try try
{ {
mLogFile.write( eventLogEntry + "\n" ); mLogFile.write(eventLogEntry + "\n");
mLogFile.flush(); mLogFile.flush();
} }
catch ( IOException e ) catch(IOException e)
{ {
mLog.error( "Error writing entry to event log file", e ); mLog.error("Error writing entry to event log file", e);
} }
} }
} }