diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-12-28 13:42:42 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-12-28 13:42:42 -0500 |
| commit | 0b3ec059c3a4164ad79fba1949884b93c2a8bf6f (patch) | |
| tree | 99917486bd687e23ff489767507e430fe1f05c06 | |
| parent | f31efcb62d43b05cafe0fd351a26addd93b11b81 (diff) | |
| parent | de1495763f6c54906e8f06f147bfa76a9d1c6bec (diff) | |
Merge pull request #1373 from MediaBrowser/master
add tuner error handling
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs index 41ba1967a..4ebc173b5 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs @@ -107,11 +107,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts foreach (var host in hosts) { - var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false); + try + { + var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false); - if (channels.Any(i => string.Equals(i.Id, channelId, StringComparison.OrdinalIgnoreCase))) + if (channels.Any(i => string.Equals(i.Id, channelId, StringComparison.OrdinalIgnoreCase))) + { + hostsWithChannel.Add(host); + } + } + catch (Exception ex) { - hostsWithChannel.Add(host); + Logger.Error("Error getting channels", ex); } } @@ -172,11 +179,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts { if (string.IsNullOrWhiteSpace(streamId)) { - var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false); + try + { + var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false); - if (channels.Any(i => string.Equals(i.Id, channelId, StringComparison.OrdinalIgnoreCase))) + if (channels.Any(i => string.Equals(i.Id, channelId, StringComparison.OrdinalIgnoreCase))) + { + hostsWithChannel.Add(host); + } + } + catch (Exception ex) { - hostsWithChannel.Add(host); + Logger.Error("Error getting channels", ex); } } else if (streamId.StartsWith(host.Id, StringComparison.OrdinalIgnoreCase)) |