GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 01:27:34 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#132 - adds enhanced streaming connection error handling. Adds specific handler for connection timeout to reset the connection.

Browse Source
This commit is contained in:
Denny
2017-01-24 19:26:18 -05:00
parent 3c9c7794c9
commit 8a8fbc4936
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 @Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception 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"); String reason = ioe.getMessage();
disconnect();
connect(); 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 else
{ {
mLog.error("IO Exception", ioe); setBroadcastState(BroadcastState.ERROR);
disconnect();
mLog.error("Unspecified IO error - streaming halted.");
} }
} }
else else

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

@@ -241,19 +241,38 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
@Override @Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception 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"); String reason = ioe.getMessage();
disconnect();
connect(); 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 else
{ {
mLog.error("IO Exception", ioe); setBroadcastState(BroadcastState.ERROR);
disconnect();
mLog.error("Unspecified IO error - streaming halted.");
} }
} }
else else

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

@@ -356,19 +356,38 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
@Override @Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception 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"); String reason = ioe.getMessage();
disconnect();
connect(); 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 else
{ {
mLog.error("IO Exception", ioe); setBroadcastState(BroadcastState.ERROR);
disconnect();
mLog.error("Unspecified IO error - streaming halted.");
} }
} }
else else