Change [Conditional] logging in favor of Log.IsDebugEnabled

Author: mythz

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -36,15 +36,6 @@ protected OrmLiteDialectProviderBase()
             StringSerializer = new JsvStringSerializer();
         }
 
-        [Conditional("DEBUG")]
-        private static void LogDebug(string fmt, params object[] args)
-        {
-            if (args.Length > 0)
-                Log.DebugFormat(fmt, args);
-            else
-                Log.Debug(fmt);
-        }
-
         #region ADO.NET supported types
         /* ADO.NET UNDERSTOOD DATA TYPES:
 			COUNTER	DbType.Int64

src/ServiceStack.OrmLite/OrmLiteReadExtensions.cs

@@ -13,12 +13,10 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
-using System.Diagnostics;
 using System.Globalization;
 using System.Reflection;
 using System.Text;
 using ServiceStack.Logging;
-using ServiceStack.Text;
 using System.Linq;
 
 namespace ServiceStack.OrmLite
@@ -35,26 +33,26 @@ public static class OrmLiteReadExtensions
         private static readonly ILog Log = LogManager.GetLogger(typeof(OrmLiteReadExtensions));
         public const string UseDbConnectionExtensions = "Use IDbConnection Extensions instead";
 
-        [Conditional("DEBUG")]
-        private static void LogDebug(string fmt, params object[] args)
+        private static void LogDebug(string fmt)
         {
-            if (args.Length > 0)
-                Log.DebugFormat(fmt, args);
-            else
-                Log.Debug(fmt);
+            Log.Debug(fmt);
         }
 
         internal static IDataReader ExecReader(this IDbCommand dbCmd, string sql)
         {
-            LogDebug(sql);
+            if (Log.IsDebugEnabled)
+                LogDebug(sql);
+
             dbCmd.CommandTimeout = OrmLiteConfig.CommandTimeout;
             dbCmd.CommandText = sql;
             return dbCmd.ExecuteReader();
         }
 
         internal static IDataReader ExecReader(this IDbCommand dbCmd, string sql, IEnumerable<IDataParameter> parameters)
         {
-            LogDebug(sql);
+            if (Log.IsDebugEnabled)
+                LogDebug(sql);
+
             dbCmd.CommandTimeout = OrmLiteConfig.CommandTimeout;
             dbCmd.CommandText = sql;
             dbCmd.Parameters.Clear();

src/ServiceStack.OrmLite/OrmLiteWriteExtensions.cs

@@ -13,7 +13,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
-using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
 using ServiceStack.Logging;
@@ -23,15 +22,10 @@ namespace ServiceStack.OrmLite
     public static class OrmLiteWriteExtensions
     {
         private static readonly ILog Log = LogManager.GetLogger(typeof(OrmLiteWriteExtensions));
-        private const string UseDbConnectionExtensions = "Use IDbConnection Extensions instead";
 
-        [Conditional("DEBUG")]
-        private static void LogDebug(string fmt, params object[] args)
+        private static void LogDebug(string fmt)
         {
-            if (args.Length > 0)
-                Log.DebugFormat(fmt, args);
-            else
-                Log.Debug(fmt);
+            Log.Debug(fmt);
         }
 
         internal static void CreateTables(this IDbCommand dbCmd, bool overwrite, params Type[] tableTypes)
@@ -212,7 +206,8 @@ internal static string LastSql(this IDbCommand dbCmd)
 
         internal static int ExecuteSql(this IDbCommand dbCmd, string sql)
         {
-            LogDebug(sql);
+            if (Log.IsDebugEnabled)
+                LogDebug(sql);
 
             dbCmd.CommandText = sql;
 

tests/ServiceStack.OrmLite.Tests/JoinSqlBuilderTests.cs

@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
+using ServiceStack.Logging;
 using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.Tests

tests/ServiceStack.OrmLite.Tests/OrmLiteTestBase.cs

@@ -65,7 +65,7 @@ protected void CreateNewDatabase()
 		[TestFixtureSetUp]
 		public void TestFixtureSetUp()
 		{
-			LogManager.LogFactory = new ConsoleLogFactory();
+			LogManager.LogFactory = new ConsoleLogFactory(debugEnabled:false);
 
 		    switch (Dialect)
 		    {