GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge pull request #134 from DSheirer/132-streaming_error_socket_timeout

Browse Source 
#132 - adds enhanced streaming connection error handling.  Adds speci…
This commit is contained in:
Denny Sheirer
2017-01-24 19:31:00 -05:00
committed by GitHub
parent 3c9c7794c9 8a8fbc4936
commit 8b403e6d87
3 changed files with 78 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java
View File

@@ -240,19 +240,38 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
@Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception
{
if(cause instanceof IOException && ((IOException) cause).getMessage().startsWith("Connection reset"))
if(cause instanceof IOException)
{
IOException ioe = (IOException) cause;
IOException ioe = (IOException)cause;
if(ioe.getMessage() != null && ioe.getMessage().startsWith("Connection reset"))
if(ioe.getMessage() != null)
{
mLog.info("Streaming connection reset by remote server - reestablishing connection");
disconnect();
connect();
String reason = ioe.getMessage();
if(reason.startsWith("Connection reset"))
{
mLog.info("Streaming connection reset by remote server - reestablishing connection");
disconnect();
connect();
}
else if(reason.startsWith("Operation timed out"))
{
mLog.info("Streaming connection timed out - resetting connection");
disconnect();
connect();
}
else
{
setBroadcastState(BroadcastState.ERROR);
disconnect();
mLog.error("Unrecognized IO error: " + reason + ". Streaming halted.");
}
}
else
{
mLog.error("IO Exception", ioe);
setBroadcastState(BroadcastState.ERROR);
disconnect();
mLog.error("Unspecified IO error - streaming halted.");
}
}
else

33
src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java
View File

@@ -241,19 +241,38 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
@Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception
{
if(cause instanceof IOException && ((IOException) cause).getMessage().startsWith("Connection reset"))
if(cause instanceof IOException)
{
IOException ioe = (IOException) cause;
IOException ioe = (IOException)cause;
if(ioe.getMessage() != null && ioe.getMessage().startsWith("Connection reset"))
if(ioe.getMessage() != null)
{
mLog.info("Streaming connection reset by remote server - reestablishing connection");
disconnect();
connect();
String reason = ioe.getMessage();
if(reason.startsWith("Connection reset"))
{
mLog.info("Streaming connection reset by remote server - reestablishing connection");
disconnect();
connect();
}
else if(reason.startsWith("Operation timed out"))
{
mLog.info("Streaming connection timed out - resetting connection");
disconnect();
connect();
}
else
{
setBroadcastState(BroadcastState.ERROR);
disconnect();
mLog.error("Unrecognized IO error: " + reason + ". Streaming halted.");
}
}
else
{
mLog.error("IO Exception", ioe);
setBroadcastState(BroadcastState.ERROR);
disconnect();
mLog.error("Unspecified IO error - streaming halted.");
}
}
else

33
src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java
View File

@@ -356,19 +356,38 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
@Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception
{
if(cause instanceof IOException && ((IOException) cause).getMessage().startsWith("Connection reset"))
if(cause instanceof IOException)
{
IOException ioe = (IOException) cause;
IOException ioe = (IOException)cause;
if(ioe.getMessage() != null && ioe.getMessage().startsWith("Connection reset"))
if(ioe.getMessage() != null)
{
mLog.info("Streaming connection reset by remote server - reestablishing connection");
disconnect();
connect();
String reason = ioe.getMessage();
if(reason.startsWith("Connection reset"))
{
mLog.info("Streaming connection reset by remote server - reestablishing connection");
disconnect();
connect();
}
else if(reason.startsWith("Operation timed out"))
{
mLog.info("Streaming connection timed out - resetting connection");
disconnect();
connect();
}
else
{
setBroadcastState(BroadcastState.ERROR);
disconnect();
mLog.error("Unrecognized IO error: " + reason + ". Streaming halted.");
}
}
else
{
mLog.error("IO Exception", ioe);
setBroadcastState(BroadcastState.ERROR);
disconnect();
mLog.error("Unspecified IO error - streaming halted.");
}
}
else