From 5de8b92fe566a156197ec3ac49892fdf6168f1ca Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Sep 2014 21:44:40 -0400 Subject: updated nuget --- .../Connect/ConnectManager.cs | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Connect') diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index af1628ba47..dc03f14cbe 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -1,10 +1,12 @@ -using MediaBrowser.Common.Configuration; +using System.Net; +using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Net; using MediaBrowser.Controller; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Connect; using MediaBrowser.Controller.Security; using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Net; using MediaBrowser.Model.Serialization; using System; using System.Collections.Generic; @@ -93,11 +95,26 @@ namespace MediaBrowser.Server.Implementations.Connect var hasExistingRecord = !string.IsNullOrWhiteSpace(ConnectServerId) && !string.IsNullOrWhiteSpace(ConnectAccessKey); + var createNewRegistration = !hasExistingRecord; + if (hasExistingRecord) { - await UpdateServerRegistration(wanApiAddress).ConfigureAwait(false); + try + { + await UpdateServerRegistration(wanApiAddress).ConfigureAwait(false); + } + catch (HttpException ex) + { + if (!ex.StatusCode.HasValue || ex.StatusCode.Value != HttpStatusCode.NotFound || ex.StatusCode.Value != HttpStatusCode.Unauthorized) + { + throw; + } + + createNewRegistration = true; + } } - else + + if (createNewRegistration) { await CreateServerRegistration(wanApiAddress).ConfigureAwait(false); } @@ -136,7 +153,6 @@ namespace MediaBrowser.Server.Implementations.Connect url = GetConnectUrl(url); url += "?id=" + ConnectServerId; - // TODO: Add Access-Key http request header var options = new HttpRequestOptions { Url = url, -- cgit v1.2.3