mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 02:57:35 -05:00
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:
@@ -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());
|
||||||
|
|||||||
@@ -1,22 +1,28 @@
|
|||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* 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
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* 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,117 +32,107 @@ 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;
|
|
||||||
mFileNameSuffix = fileNameSuffix;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String toString()
|
|
||||||
{
|
|
||||||
if( mLogFileName != null )
|
|
||||||
{
|
|
||||||
return mLogFileName;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return "Unknown";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract String getHeader();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void start( ScheduledExecutorService executor )
|
|
||||||
{
|
{
|
||||||
if( mLogFile == null )
|
mLogDirectory = logDirectory;
|
||||||
{
|
mFileNameSuffix = fileNameSuffix;
|
||||||
try
|
}
|
||||||
{
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
sb.append( mLogDirectory );
|
|
||||||
sb.append( File.separator );
|
|
||||||
sb.append( TimeStamp.getTimeStamp( "_" ) );
|
|
||||||
sb.append( "_" );
|
|
||||||
sb.append( replaceIllegalCharacters( mFileNameSuffix ) );
|
|
||||||
|
|
||||||
mLogFileName = sb.toString();
|
public String toString()
|
||||||
|
{
|
||||||
|
if(mLogFileName != null)
|
||||||
|
{
|
||||||
|
return mLogFileName;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return "Unknown";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mLog.info( "Creating log file:" + mLogFileName );
|
public abstract String getHeader();
|
||||||
|
|
||||||
mLogFile = new OutputStreamWriter(new FileOutputStream( mLogFileName ) );
|
@Override
|
||||||
|
public void start(ScheduledExecutorService executor)
|
||||||
|
{
|
||||||
|
if(mLogFile == null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append(mLogDirectory);
|
||||||
|
sb.append(File.separator);
|
||||||
|
sb.append(TimeStamp.getTimeStamp("_"));
|
||||||
|
sb.append("_");
|
||||||
|
sb.append(replaceIllegalCharacters(mFileNameSuffix));
|
||||||
|
|
||||||
write( getHeader() );
|
mLogFileName = sb.toString();
|
||||||
}
|
|
||||||
catch (FileNotFoundException e)
|
mLog.info("Creating log file:" + mLogFileName);
|
||||||
{
|
|
||||||
mLog.error("Couldn't create log file in directory:" + mLogDirectory );
|
mLogFile = new OutputStreamWriter(new FileOutputStream(mLogFileName));
|
||||||
}
|
|
||||||
}
|
write(getHeader());
|
||||||
|
}
|
||||||
|
catch(FileNotFoundException e)
|
||||||
|
{
|
||||||
|
mLog.error("Couldn't create log file in directory:" + mLogDirectory);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stop()
|
public void stop()
|
||||||
{
|
{
|
||||||
if( mLogFile != null )
|
if(mLogFile != null)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
mLogFile.flush();
|
mLogFile.flush();
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user