Improve InternalLogger output when connect fails with ServiceUri (#151)

Author: snakefoot

src/NLog.Extensions.AzureBlobStorage/BlobStorageTarget.cs

@@ -173,7 +173,7 @@ protected override void InitializeTarget()
             }
             catch (Exception ex)
             {
-                if (string.IsNullOrEmpty(connectionString) && !string.IsNullOrEmpty(serviceUri))
+                if (!string.IsNullOrEmpty(serviceUri))
                     InternalLogger.Error(ex, "AzureBlobStorageTarget(Name={0}): Failed to create BlobClient with ServiceUri={1}.", Name, serviceUri);
                 else
                     InternalLogger.Error(ex, "AzureBlobStorageTarget(Name={0}): Failed to create BlobClient with connectionString={1}.", Name, connectionString);

src/NLog.Extensions.AzureDataTables/DataTablesTarget.cs

@@ -170,8 +170,11 @@ protected override void InitializeTarget()
             }
             catch (Exception ex)
             {
-                InternalLogger.Error(ex, "AzureDataTablesTarget(Name={0}): Failed to create TableClient with connectionString={1}.", Name, connectionString);
-                throw;
+                if (!string.IsNullOrEmpty(serviceUri))
+                    InternalLogger.Error(ex, "AzureDataTablesTarget(Name={0}): Failed to create TableClient with ServiceUri={1}.", Name, serviceUri);
+                else
+                    InternalLogger.Error(ex, "AzureDataTablesTarget(Name={0}): Failed to create TableClient with ConnectionString={1}.", Name, connectionString);
+               throw;
             }
         }
 

src/NLog.Extensions.AzureEventHub/EventHubTarget.cs

@@ -187,7 +187,10 @@ protected override void InitializeTarget()
             }
             catch (Exception ex)
             {
-                InternalLogger.Error(ex, "AzureEventHubTarget(Name={0}): Failed to create EventHubClient with connectionString={1} to EventHubName={2}.", Name, connectionString, eventHubName);
+                if (!string.IsNullOrEmpty(serviceUri))
+                    InternalLogger.Error(ex, "AzureEventHubTarget(Name={0}): Failed to create EventHubClient with EventHubName={1} and ServiceUri={2}.", Name, eventHubName, serviceUri);
+                else
+                    InternalLogger.Error(ex, "AzureEventHubTarget(Name={0}): Failed to create EventHubClient with EventHubName={1} and ConnectionString={2}", Name, eventHubName, connectionString);
                 throw;
             }
         }

src/NLog.Extensions.AzureQueueStorage/QueueStorageTarget.cs

@@ -159,7 +159,7 @@ protected override void InitializeTarget()
             }
             catch (Exception ex)
             {
-                if (string.IsNullOrEmpty(connectionString) && !string.IsNullOrEmpty(serviceUri))
+                if (!string.IsNullOrEmpty(serviceUri))
                     InternalLogger.Error(ex, "AzureQueueStorageTarget(Name={0}): Failed to create QueueClient with ServiceUri={1}.", Name, serviceUri);
                 else
                     InternalLogger.Error(ex, "AzureQueueStorageTarget(Name={0}): Failed to create QueueClient with connectionString={1}.", Name, connectionString);

src/NLog.Extensions.AzureServiceBus/ServiceBusTarget.cs

@@ -223,7 +223,10 @@ protected override void InitializeTarget()
             }
             catch (Exception ex)
             {
-                InternalLogger.Error(ex, "AzureServiceBusTarget(Name={0}): Failed to create ServiceBusClient with connectionString={1} and EntityPath={2}.", Name, connectionString, queueOrTopicName);
+                if (!string.IsNullOrEmpty(serviceUri))
+                    InternalLogger.Error(ex, "AzureServiceBusTarget(Name={0}): Failed to create ServiceBusClient with EntityPath={1} and ServiceUri={2}", Name, queueOrTopicName, serviceUri);
+                else
+                    InternalLogger.Error(ex, "AzureServiceBusTarget(Name={0}): Failed to create ServiceBusClient with EntityPath={1} and ConnectionString={2}", Name, queueOrTopicName, connectionString);
                 throw;
             }
         }