Revert PR 296, due to errors seen during the release process (#319)

Azure · Nov 22, 2018 · c1bc7e9 · c1bc7e9
1 parent 2680d01
commit c1bc7e9
Show file tree

Hide file tree

Showing 10 changed files with 278 additions and 321 deletions.
diff --git a/Services/IStatusService.cs b/Services/IStatusService.cs
diff --git a/Services/Models/StatusResultServiceModel.cs b/Services/Models/StatusResultServiceModel.cs
diff --git a/Services/Models/StatusServiceModel.cs b/Services/Models/StatusServiceModel.cs
diff --git a/Services/PreprovisionedIotHub.cs b/Services/PreprovisionedIotHub.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Azure.IoTSolutions.DeviceSimulation.Services
     public interface IPreprovisionedIotHub
     {
         // Ping the registry to see if the connection is healthy
-        Task<StatusResultServiceModel> PingRegistryAsync();
+        Task<Tuple<bool, string>> PingRegistryAsync();
     }
 
     public class PreprovisionedIotHub : IPreprovisionedIotHub
@@ -36,23 +36,21 @@ public PreprovisionedIotHub(
         }
 
         // Ping the registry to see if the connection is healthy
-        public async Task<StatusResultServiceModel> PingRegistryAsync()
+        public async Task<Tuple<bool, string>> PingRegistryAsync()
         {
-            var result = new StatusResultServiceModel(false, "IoTHub check failed");
-            
+            await this.InitAsync();
+
             try
             {
                 await this.InitAsync();
                 await this.registry.GetDeviceAsync("healthcheck");
-                result.IsHealthy = true;
-                result.Message = "Alive and Well!";
+                return new Tuple<bool, string>(true, "OK");
             }
             catch (Exception e)
             {
                 this.log.Error("Device registry test failed", e);
+                return new Tuple<bool, string>(false, e.Message);
             }
-
-            return result;
         }
 
         // This call can throw an exception, which is fine when the exception happens during a method

diff --git a/Services/StatusService.cs b/Services/StatusService.cs
diff --git a/Services/StorageAdapter/StorageAdapterClient.cs b/Services/StorageAdapter/StorageAdapterClient.cs
@@ -8,14 +8,14 @@
 using Microsoft.Azure.IoTSolutions.DeviceSimulation.Services.Diagnostics;
 using Microsoft.Azure.IoTSolutions.DeviceSimulation.Services.Exceptions;
 using Microsoft.Azure.IoTSolutions.DeviceSimulation.Services.Http;
-using Microsoft.Azure.IoTSolutions.DeviceSimulation.Services.Models;
 using Microsoft.Azure.IoTSolutions.DeviceSimulation.Services.Runtime;
 using Newtonsoft.Json;
 
 namespace Microsoft.Azure.IoTSolutions.DeviceSimulation.Services.StorageAdapter
 {
     public interface IStorageAdapterClient
     {
+        Task<Tuple<bool, string>> PingAsync();
         Task<ValueListApiModel> GetAllAsync(string collectionId);
         Task<ValueApiModel> GetAsync(string collectionId, string key);
         Task<ValueApiModel> CreateAsync(string collectionId, string value);
@@ -50,6 +50,36 @@ public StorageAdapterClient(
             this.diagnosticsLogger = diagnosticsLogger;
         }
 
+        public async Task<Tuple<bool, string>> PingAsync()
+        {
+            var status = false;
+            var message = "";
+
+            try
+            {
+                var response = await this.httpClient.GetAsync(this.PrepareRequest($"status"));
+                if (response.IsError)
+                {
+                    message = "Status code: " + response.StatusCode;
+                }
+                else
+                {
+                    var data = JsonConvert.DeserializeObject<Dictionary<string, object>>(response.Content);
+                    message = data["Status"].ToString();
+                    status = data["Status"].ToString().StartsWith("OK:");
+                }
+            }
+            catch (Exception e)
+            {
+                var msg = "Storage adapter check failed";
+                this.log.Error(msg, e);
+                this.diagnosticsLogger.LogServiceError(msg, e.Message);
+                message = e.Message;
+            }
+
+            return new Tuple<bool, string>(status, message);
+        }
+
         public async Task<ValueListApiModel> GetAllAsync(string collectionId)
         {
             var response = await this.httpClient.GetAsync(