From c30bea9a70bf4c68be9c3cac3be0d1de202b9ebc Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 29 Dec 2015 14:06:32 -0500 Subject: [PATCH] update ping test --- MediaBrowser.Api/System/SystemService.cs | 4 ++-- .../ApplicationHost.cs | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs index 4faff87804..539b920a79 100644 --- a/MediaBrowser.Api/System/SystemService.cs +++ b/MediaBrowser.Api/System/SystemService.cs @@ -123,9 +123,9 @@ namespace MediaBrowser.Api.System return ToOptimizedResult(result); } - public void Post(PingSystem request) + public object Post(PingSystem request) { - + return _appHost.Name; } public object Get(GetServerLogs request) diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index ec436a44f5..b102210502 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -1173,17 +1173,27 @@ namespace MediaBrowser.Server.Startup.Common { Url = apiUrl, LogErrorResponseBody = false, - LogErrors = false + LogErrors = false, + LogRequest = false }, "POST").Result) { - _validAddressResults.AddOrUpdate(apiUrl, true, (k, v) => true); - return true; + using (var reader = new StreamReader(response.Content)) + { + var result = reader.ReadToEnd(); + var valid = string.Equals(Name, result, StringComparison.OrdinalIgnoreCase); + + _validAddressResults.AddOrUpdate(apiUrl, valid, (k, v) => valid); + Logger.Debug("Ping test result to {0}. Success: {1}", apiUrl, valid); + return valid; + } } } catch { - _validAddressResults.AddOrUpdate(apiUrl, true, (k, v) => false); + Logger.Debug("Ping test result to {0}. Success: {1}", apiUrl, false); + + _validAddressResults.AddOrUpdate(apiUrl, false, (k, v) => false); return false; } }