michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1373 from MediaBrowser/master

Browse Source 
add tuner error handling
This commit is contained in:
Luke 2015-12-28 13:42:42 -05:00
commit 0b3ec059c3
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
View File

@ -106,6 +106,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
var hostsWithChannel = new List<TunerHostInfo>(); var hostsWithChannel = new List<TunerHostInfo>();
foreach (var host in hosts) foreach (var host in hosts)
{
try
{ {
var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false); var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false);
@ -114,6 +116,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
hostsWithChannel.Add(host); hostsWithChannel.Add(host);
} }
} }
catch (Exception ex)
{
Logger.Error("Error getting channels", ex);
}
}
foreach (var host in hostsWithChannel) foreach (var host in hostsWithChannel)
{ {
@ -171,6 +178,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
foreach (var host in hosts) foreach (var host in hosts)
{ {
if (string.IsNullOrWhiteSpace(streamId)) if (string.IsNullOrWhiteSpace(streamId))
{
try
{ {
var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false); var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false);
@ -179,6 +188,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
hostsWithChannel.Add(host); hostsWithChannel.Add(host);
} }
} }
catch (Exception ex)
{
Logger.Error("Error getting channels", ex);
}
}
else if (streamId.StartsWith(host.Id, StringComparison.OrdinalIgnoreCase)) else if (streamId.StartsWith(host.Id, StringComparison.OrdinalIgnoreCase))
{ {
hostsWithChannel = new List<TunerHostInfo> { host }; hostsWithChannel = new List<TunerHostInfo> { host };