From 6f7d7e61b911518aadcd6dc0b061d0eafd8a7acf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 2 Jun 2015 23:16:39 -0400 Subject: [PATCH] add logging to connect reporting --- .../Connect/ConnectEntryPoint.cs | 7 ++++++- .../Connect/ConnectManager.cs | 10 +++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs b/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs index 52ec5c9b12..3e211d003e 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs @@ -3,6 +3,7 @@ using MediaBrowser.Common.Net; using MediaBrowser.Controller.Connect; using MediaBrowser.Controller.Plugins; using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Net; using System; using System.IO; using System.Net; @@ -59,9 +60,13 @@ namespace MediaBrowser.Server.Implementations.Connect } } } - catch + catch (HttpException) { } + catch (Exception ex) + { + _logger.ErrorException("Error getting connection info", ex); + } } private string CacheFilePath diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index 2d39f760e8..048287faa4 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -130,7 +130,7 @@ namespace MediaBrowser.Server.Implementations.Connect UpdateConnectInfo(); } - private async void UpdateConnectInfo() + private async Task UpdateConnectInfo() { await _operationLock.WaitAsync().ConfigureAwait(false); @@ -399,6 +399,10 @@ namespace MediaBrowser.Server.Implementations.Connect throw new ArgumentNullException("connectUsername"); } if (string.IsNullOrWhiteSpace(ConnectServerId)) + { + await UpdateConnectInfo().ConfigureAwait(false); + } + if (string.IsNullOrWhiteSpace(ConnectServerId)) { throw new ArgumentNullException("ConnectServerId"); } @@ -492,6 +496,10 @@ namespace MediaBrowser.Server.Implementations.Connect throw new ArgumentNullException("connectUsername"); } if (string.IsNullOrWhiteSpace(ConnectServerId)) + { + await UpdateConnectInfo().ConfigureAwait(false); + } + if (string.IsNullOrWhiteSpace(ConnectServerId)) { throw new ArgumentNullException("ConnectServerId"); }