From e26698d0d881ad9712ac62570e793a8d291fc313 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Tue, 16 Jun 2020 05:17:05 -0400 Subject: [PATCH] #839 Updates logging for tuner unavailable to allocate traffic channel frequencies. Logs the frequency once and then suppresses further logging. (#870) Co-authored-by: Denny --- .../channel/ChannelProcessingManager.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/github/dsheirer/controller/channel/ChannelProcessingManager.java b/src/main/java/io/github/dsheirer/controller/channel/ChannelProcessingManager.java index 02ff6c73..283e9ddf 100644 --- a/src/main/java/io/github/dsheirer/controller/channel/ChannelProcessingManager.java +++ b/src/main/java/io/github/dsheirer/controller/channel/ChannelProcessingManager.java @@ -83,6 +83,7 @@ public class ChannelProcessingManager implements Listener private SourceManager mSourceManager; private AliasModel mAliasModel; private UserPreferences mUserPreferences; + private List mUnTunableFrequencies = new ArrayList<>(); /** * Constructs the channel processing manager @@ -185,15 +186,25 @@ public class ChannelProcessingManager implements Listener if(channel.getSourceConfiguration() instanceof SourceConfigTuner) { long frequency = ((SourceConfigTuner)channel.getSourceConfiguration()).getFrequency(); - mLog.error("Error starting requested channel [" + channel.getName() + ":" + frequency + - "] - " + ce.getMessage()); + + if(!mUnTunableFrequencies.contains(frequency)) + { + mUnTunableFrequencies.add(frequency); + mLog.error("Error starting requested channel [" + channel.getName() + ":" + frequency + + "] - " + ce.getMessage()); + } } else if(channel.getSourceConfiguration() instanceof SourceConfigTunerMultipleFrequency) { List frequencies = ((SourceConfigTunerMultipleFrequency)channel .getSourceConfiguration()).getFrequencies(); - mLog.error("Error starting requested channel [" + channel.getName() + ":" + frequencies + - "] - " + ce.getMessage()); + + if(frequencies.size() > 0 && !mUnTunableFrequencies.contains(frequencies.get(0))) + { + mUnTunableFrequencies.add(frequencies.get(0)); + mLog.error("Error starting requested channel [" + channel.getName() + ":" + frequencies + + "] - " + ce.getMessage()); + } } else {