aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-12-29 14:06:32 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-12-29 14:07:25 -0500
commitc30bea9a70bf4c68be9c3cac3be0d1de202b9ebc (patch)
treec74aecf41f4d8755a87f5e462d0421ba9d1d52d7
parent3c75008483a0bb2e1d50a25c0bff56bdfc3a2de4 (diff)
update ping test
-rw-r--r--MediaBrowser.Api/System/SystemService.cs4
-rw-r--r--MediaBrowser.Server.Startup.Common/ApplicationHost.cs18
2 files changed, 16 insertions, 6 deletions
diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs
index 4faff8780..539b920a7 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 ec436a44f..b10221050 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;
}
}