mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
Merge pull request #1372 from MediaBrowser/master
add tuner error handling
This commit is contained in:
commit
a7c7446bd0
1 changed files with 22 additions and 8 deletions
|
@ -106,6 +106,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
|
|||
var hostsWithChannel = new List<TunerHostInfo>();
|
||||
|
||||
foreach (var host in hosts)
|
||||
{
|
||||
try
|
||||
{
|
||||
var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
|
@ -114,6 +116,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
|
|||
hostsWithChannel.Add(host);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Error("Error getting channels", ex);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var host in hostsWithChannel)
|
||||
{
|
||||
|
@ -171,6 +178,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
|
|||
foreach (var host in hosts)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(streamId))
|
||||
{
|
||||
try
|
||||
{
|
||||
var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
|
@ -179,6 +188,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
|
|||
hostsWithChannel.Add(host);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Error("Error getting channels", ex);
|
||||
}
|
||||
}
|
||||
else if (streamId.StartsWith(host.Id, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
hostsWithChannel = new List<TunerHostInfo> { host };
|
||||
|
|
Loading…
Reference in a new issue