From 95c38df812075776884d24f1d9a105c1afa1945d Mon Sep 17 00:00:00 2001 From: denny Date: Sat, 19 Sep 2015 20:02:26 -0400 Subject: [PATCH] Resolved issue with delayed event log writing ... added forced flushing after each event write. --- src/audio/AudioModule.java | 15 ++++++--------- src/instrument/gui/DecoderSelectionFrame.java | 1 - src/module/decode/state/ChannelState.java | 9 --------- src/module/log/EventLogger.java | 1 + 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/audio/AudioModule.java b/src/audio/AudioModule.java index 4fb091d2..f810354e 100644 --- a/src/audio/AudioModule.java +++ b/src/audio/AudioModule.java @@ -98,13 +98,12 @@ public class AudioModule extends Module implements IAudioPacketProvider, @Override public void stop() { -// /* Issue an end audio packet in case a recorder is still rolling */ -// if( mAudioPacketListener != null ) -// { -// mLog.debug( "Sending end audio packet - stop() invoked" ); -// mAudioPacketListener.receive( new AudioPacket( AudioPacket.Type.END, -// mAudioMetadata.copyOf() ) ); -// } + /* Issue an end audio packet in case a recorder is still rolling */ + if( mAudioPacketListener != null ) + { + mAudioPacketListener.receive( new AudioPacket( AudioPacket.Type.END, + mAudioMetadata.copyOf() ) ); + } } /** @@ -201,8 +200,6 @@ public class AudioModule extends Module implements IAudioPacketProvider, @Override public void receive( SquelchState state ) { - mLog.debug( "Squelch State:" + state ); - if( state == SquelchState.SQUELCH && mAudioPacketListener != null ) { mAudioPacketListener.receive( new AudioPacket( AudioPacket.Type.END, diff --git a/src/instrument/gui/DecoderSelectionFrame.java b/src/instrument/gui/DecoderSelectionFrame.java index ef1b3cff..3faccf90 100644 --- a/src/instrument/gui/DecoderSelectionFrame.java +++ b/src/instrument/gui/DecoderSelectionFrame.java @@ -7,7 +7,6 @@ import java.awt.event.ActionListener; import javax.swing.JButton; import javax.swing.JDesktopPane; import javax.swing.JInternalFrame; -import javax.swing.JPanel; import module.decode.DecodeComponentEditor; import module.decode.config.DecodeConfiguration; diff --git a/src/module/decode/state/ChannelState.java b/src/module/decode/state/ChannelState.java index f93ec5f4..f8454938 100644 --- a/src/module/decode/state/ChannelState.java +++ b/src/module/decode/state/ChannelState.java @@ -230,13 +230,9 @@ public class ChannelState extends Module implements ICallEventProvider, ( mChannelType == ChannelType.STANDARD ? FADE_TIMEOUT_DELAY : mTrafficChannelTimeout ); - mLog.debug( "Updating Fade Timeout - previous [" + mFadeTimeout + "] new [" + timeout + "] current [" + current + "] delay [" + ( mChannelType == ChannelType.STANDARD ? FADE_TIMEOUT_DELAY : - mTrafficChannelTimeout ) + "]" ); - if( timeout > mFadeTimeout ) { mFadeTimeout = timeout; - mLog.debug( "Timeout updated to: " + mFadeTimeout ); } } @@ -307,7 +303,6 @@ public class ChannelState extends Module implements ICallEventProvider, case CONTROL: case DATA: case ENCRYPTED: - mLog.debug( "Squelching for [" + state + "]" ); broadcast( SquelchState.SQUELCH ); updateFadeTimeout(); startMonitor(); @@ -318,19 +313,16 @@ public class ChannelState extends Module implements ICallEventProvider, startMonitor(); break; case FADE: - mLog.debug( "Squelching for [" + state + "]" ); broadcast( SquelchState.SQUELCH ); updateResetTimeout(); startMonitor(); break; case END: - mLog.debug( "Squelching for [" + state + "]" ); broadcast( SquelchState.SQUELCH ); broadcast( new DecoderStateEvent( this, Event.RESET, State.IDLE ) ); broadcast( new MetadataReset() ); break; case IDLE: - mLog.debug( "Squelching for [" + state + "]" ); broadcast( SquelchState.SQUELCH ); stopMonitor(); @@ -381,7 +373,6 @@ public class ChannelState extends Module implements ICallEventProvider, { if( mFadeTimeout <= System.currentTimeMillis() ) { - mLog.debug( "Fading for timeout [" + mFadeTimeout + "] current [" + System.currentTimeMillis() + "]" ); setState( State.FADE ); } } diff --git a/src/module/log/EventLogger.java b/src/module/log/EventLogger.java index a1d212e1..b1d5e46f 100644 --- a/src/module/log/EventLogger.java +++ b/src/module/log/EventLogger.java @@ -130,6 +130,7 @@ public abstract class EventLogger extends Module try { mLogFile.write( eventLogEntry + "\n" ); + mLogFile.flush(); } catch ( IOException e ) {