Merged PR 928443: Fix for EdgeAgent using MQTT

When I changed EdgeAgent to use MQTT to connect to IoTHub, the agent threw an exception. Turns out it was a log line check making an assumption that only AMQP or AMQPWS would be used.
Azure · Jun 28, 2018 · 2d6824b · 2d6824b
1 parent eeac6d6
commit 2d6824b
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.IoTHub/ModuleClient.cs b/edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.IoTHub/ModuleClient.cs
@@ -156,21 +156,15 @@ enum EventIds
                 RetryingDeviceClientConnection,
                 DeviceClientSetupFailed
             }
-
-            static string TransportName(TransportType type)
-            {
-                Preconditions.CheckArgument(type == TransportType.Amqp_Tcp_Only || type == TransportType.Amqp_WebSocket_Only);
-                return type == TransportType.Amqp_Tcp_Only ? "AMQP" : "AMQP over WebSocket";
-            }
-
+
             public static void AttemptingConnectionWithTransport(TransportType transport)
             {
-                Log.LogInformation((int)EventIds.AttemptingConnect, $"Edge agent attempting to connect to IoT Hub via {TransportName(transport)}...");
+                Log.LogInformation((int)EventIds.AttemptingConnect, $"Edge agent attempting to connect to IoT Hub via {transport.ToString()}...");
             }
 
             public static void ConnectedWithTransport(TransportType transport)
             {
-                Log.LogInformation((int)EventIds.Connected, $"Edge agent connected to IoT Hub via {TransportName(transport)}.");
+                Log.LogInformation((int)EventIds.Connected, $"Edge agent connected to IoT Hub via {transport.ToString()}.");
             }
 
             public static void DeviceClientCreated()