rework hosting options

1 files changed, 27 insertions, 4 deletions

diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index 194a8a4a23..d3a29f4205 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -78,7 +78,7 @@ namespace MediaBrowser.Server.Implementations.Connect
                     if (!ip.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
                         !ip.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
                     {
-                        ip = (_config.Configuration.UseHttps ? "https://" : "http://") + ip;
+                        ip = (_appHost.EnableHttps ? "https://" : "http://") + ip;
                     }
 
                     return ip + ":" + _config.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture);
@@ -90,7 +90,7 @@ namespace MediaBrowser.Server.Implementations.Connect
 
         private string XApplicationValue
         {
-            get { return "Media Browser Server/" + _appHost.ApplicationVersion; }
+            get { return _appHost.Name + "/" + _appHost.ApplicationVersion; }
         }
 
         public ConnectManager(ILogger logger,
@@ -112,6 +112,7 @@ namespace MediaBrowser.Server.Implementations.Connect
             _providerManager = providerManager;
 
             _userManager.UserConfigurationUpdated += _userManager_UserConfigurationUpdated;
+            _config.ConfigurationUpdated += _config_ConfigurationUpdated;
 
             LoadCachedData();
         }
@@ -164,8 +165,7 @@ namespace MediaBrowser.Server.Implementations.Connect
                     }
                     catch (HttpException ex)
                     {
-                        if (!ex.StatusCode.HasValue ||
-                            !new[] { HttpStatusCode.NotFound, HttpStatusCode.Unauthorized }.Contains(ex.StatusCode.Value))
+                        if (!ex.StatusCode.HasValue || !new[] { HttpStatusCode.NotFound, HttpStatusCode.Unauthorized }.Contains(ex.StatusCode.Value))
                         {
                             throw;
                         }
@@ -179,6 +179,8 @@ namespace MediaBrowser.Server.Implementations.Connect
                     await CreateServerRegistration(wanApiAddress, localAddress).ConfigureAwait(false);
                 }
 
+                _lastReportedIdentifier = GetConnectReportingIdentifier(localAddress, wanApiAddress);
+
                 await RefreshAuthorizationsInternal(true, CancellationToken.None).ConfigureAwait(false);
             }
             catch (Exception ex)
@@ -187,6 +189,27 @@ namespace MediaBrowser.Server.Implementations.Connect
             }
         }
 
+        private string _lastReportedIdentifier;
+        private string GetConnectReportingIdentifier()
+        {
+            return GetConnectReportingIdentifier(_appHost.GetSystemInfo().LocalAddress, WanApiAddress);
+        }
+        private string GetConnectReportingIdentifier(string localAddress, string remoteAddress)
+        {
+            return (remoteAddress ?? string.Empty) + (localAddress ?? string.Empty);
+        }
+
+        void _config_ConfigurationUpdated(object sender, EventArgs e)
+        {
+            // If info hasn't changed, don't report anything
+            if (string.Equals(_lastReportedIdentifier, GetConnectReportingIdentifier(), StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            UpdateConnectInfo();
+        }
+
         private async Task CreateServerRegistration(string wanApiAddress, string localAddress)
         {
             if (string.IsNullOrWhiteSpace(wanApiAddress))