Small cleanup around logging.

Author: cincuranet

src/FirebirdSql.Data.FirebirdClient/Logging/FbLogManager.cs

@@ -22,18 +22,15 @@ namespace FirebirdSql.Data.Logging;
 
 public static class FbLogManager
 {
-	internal static ILoggerFactory LoggerFactory = NullLoggerFactory.Instance;
-	internal static bool IsParameterLoggingEnabled = false;
+	public static bool IsParameterLoggingEnabled { get; private set; } = false;
 
-	public static void UseLoggerFactory(ILoggerFactory loggerFactory)
-	{
+	private static ILoggerFactory LoggerFactory = NullLoggerFactory.Instance;
+
+	public static void UseLoggerFactory(ILoggerFactory loggerFactory) =>
 		LoggerFactory = loggerFactory;
-	}
 
-	public static void EnableParameterLogging(bool enable = true)
-	{
+	public static void EnableParameterLogging(bool enable = true) =>
 		IsParameterLoggingEnabled = enable;
-	}
 
 	internal static ILogger<T> CreateLogger<T>() =>
 		LoggerFactory.CreateLogger<T>();

src/FirebirdSql.Data.FirebirdClient/Logging/LogMessages.cs

@@ -33,14 +33,15 @@ public static void CommandExecution(ILogger log, FbCommand command)
 			return;
 		}
 
-		if (!FbLogManager.IsParameterLoggingEnabled || !command.HasParameters)
+		if (FbLogManager.IsParameterLoggingEnabled && command.HasParameters)
+		{
+			var parameters = FbParameterCollectionToDictionary(command.Parameters);
+			log.LogDebug("Command execution: {command}, {parameters}", command.CommandText, parameters);
+		}
+		else
 		{
 			log.LogDebug("Command execution: {command}", command.CommandText);
-			return;
 		}
-
-		var parameters = FbParameterCollectionToDictionary(command.Parameters);
-		log.LogDebug("Command execution: {command}, {parameters}", command.CommandText, parameters);
 	}
 
 	public static void CommandExecution(ILogger log, FbBatchCommand command)
@@ -50,14 +51,15 @@ public static void CommandExecution(ILogger log, FbBatchCommand command)
 			return;
 		}
 
-		if (!FbLogManager.IsParameterLoggingEnabled || !command.HasParameters)
+		if (FbLogManager.IsParameterLoggingEnabled && command.HasParameters)
+		{
+			var parameters = command.BatchParameters.SelectMany(FbParameterCollectionToDictionary);
+			log.LogDebug("Command execution: {command}, {parameters}", command.CommandText, parameters);
+		}
+		else
 		{
 			log.LogDebug("Command execution: {command}", command.CommandText);
-			return;
 		}
-
-		var parameters = command.BatchParameters.SelectMany(FbParameterCollectionToDictionary);
-		log.LogDebug("Command execution: {command}, {parameters}", command.CommandText, parameters);
 	}
 
 	public static void ConnectionOpening(ILogger log, FbConnection connection) =>
@@ -129,7 +131,6 @@ private static object NormalizeDbNull(object value) =>
 	private static Dictionary<string, object> FbParameterCollectionToDictionary(FbParameterCollection parameters) =>
 		parameters
 			.Cast<DbParameter>()
-			.ToList()
 			.ToDictionary(
 				p => p.ParameterName,
 				p => NormalizeDbNull(p.Value)