Fixing an exception in SqlLoggerTextWriter when a query parameter isn…

…'t parsed correctly
Orckestra · Sep 7, 2016 · c780358 · c780358
1 parent d21f9de
commit c780358
Showing 1 changed file with 34 additions and 43 deletions.
diff --git a/...site/Plugins/Data/DataProviders/MSSqlServerDataProvider/Foundation/SqlLoggerTextWriter.cs b/...site/Plugins/Data/DataProviders/MSSqlServerDataProvider/Foundation/SqlLoggerTextWriter.cs
@@ -1,24 +1,26 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using Composite.Core.Logging;
+using Composite.Core;
 
 
 namespace Composite.Plugins.Data.DataProviders.MSSqlServerDataProvider.Foundation
 {
     internal sealed class SqlLoggerTextWriter : System.IO.TextWriter
     {
-        private static Regex ContainsParamRegex = new Regex(@"@p[0-9]+", RegexOptions.Compiled);
-        private static Regex ParamRegex = new Regex(@"-- (?<param>@p[0-9]+):", RegexOptions.Compiled);
+        private static readonly Regex ContainsParamRegex = new Regex(@"@(p|x)[0-9]+", RegexOptions.Compiled);
+        private static readonly Regex ParamRegex = new Regex(@"-- (?<param>@(p|x)[0-9]+):", RegexOptions.Compiled);
 
         private readonly SqlLoggingContext _sqlLoggingContext;
 
-        private Dictionary<int, Tuple<string, Dictionary<string, string>>> _threadData = new Dictionary<int, Tuple<string, Dictionary<string, string>>>();
-        private readonly object _lock = new object();
+        private readonly ConcurrentDictionary<int, Tuple<string, Dictionary<string, string>>> _threadData 
+            = new ConcurrentDictionary<int, Tuple<string, Dictionary<string, string>>>();
 
         public SqlLoggerTextWriter(SqlLoggingContext sqlLoggingContext)
         {
@@ -28,19 +30,16 @@ public SqlLoggerTextWriter(SqlLoggingContext sqlLoggingContext)
 
 
 
-        public override Encoding Encoding
-        {
-            get { return Encoding.UTF8; }
-        }
+        public override Encoding Encoding => Encoding.UTF8;
 
 
         public override void WriteLine(string value)
         {
-            if (value.StartsWith("--") == false)
+            if (!value.StartsWith("--"))
             {
                 HandleNewQuery(value);
             }
-            else if (value.StartsWith("-- Context:") == false)
+            else if (!value.StartsWith("-- Context:"))
             {
                 HandleParameter(value);
             }
@@ -54,9 +53,9 @@ public override void WriteLine(string value)
 
         private void HandleNewQuery(string value)
         {
-            foreach (string tableToIgnore in _sqlLoggingContext.TablesToIgnore)
+            if (_sqlLoggingContext.TablesToIgnore.Any(value.Contains))
             {
-                if (value.Contains(tableToIgnore)) return;
+                return;
             }
 
 
@@ -68,53 +67,44 @@ private void HandleNewQuery(string value)
                 return;
             }
 
-            Tuple<string, Dictionary<string, string>> entry = new Tuple<string, Dictionary<string, string>>(value, new Dictionary<string, string>());
-            lock (_lock)
-            {
-                _threadData.Add(Thread.CurrentThread.ManagedThreadId, entry);
-            }
+            var entry = new Tuple<string, Dictionary<string, string>>(value, new Dictionary<string, string>());
+
+            _threadData[Thread.CurrentThread.ManagedThreadId] = entry;
         }
 
 
 
         private void HandleParameter(string value)
         {
-            if (_threadData.ContainsKey(Thread.CurrentThread.ManagedThreadId) == false) return;
-
-            Match match = ParamRegex.Match(value);
-            string paramId = match.Groups["param"].Value;
+            Tuple<string, Dictionary<string, string>> entry;
 
-            string paramValue = value.Substring(value.IndexOf("["));
+            if (!_threadData.TryGetValue(Thread.CurrentThread.ManagedThreadId, out entry))
+            {
+                return;
+            }
 
+            Match match = ParamRegex.Match(value);
 
-            Tuple<string, Dictionary<string, string>> entry;
-            lock (_lock)
+            string paramId = match.Groups["param"].Value;
+            if (string.IsNullOrEmpty(paramId))
             {
-                entry = _threadData[Thread.CurrentThread.ManagedThreadId];
+                Log.LogWarning(nameof(SqlLoggerTextWriter), "Failed to parse parameter line: " + value);
+                return;
             }
 
+            string paramValue = value.Substring(value.IndexOf('['));
             entry.Item2.Add(paramId, paramValue);
         }
 
 
 
         public void HandleEndQuery()
         {
-            Tuple<string, Dictionary<string, string>> entry = null;
+            Tuple<string, Dictionary<string, string>> entry;
 
-            if (_threadData.ContainsKey(Thread.CurrentThread.ManagedThreadId))
-            {
-                lock (_lock)
-                {
-                    if (_threadData.ContainsKey(Thread.CurrentThread.ManagedThreadId))
-                    {
-                        entry = _threadData[Thread.CurrentThread.ManagedThreadId];
-                        _threadData.Remove(Thread.CurrentThread.ManagedThreadId);
-                    }
-                }
-            }
+            var threadId = Thread.CurrentThread.ManagedThreadId;
 
-            if (entry != null)
+            if (_threadData.TryRemove(threadId, out entry))
             {
                 string value = entry.Item1;
                 foreach (var kvp in entry.Item2)
@@ -132,10 +122,11 @@ private void AddLogEntry(string value)
         {
             if (_sqlLoggingContext.IncludeStack)
             {
-                StringBuilder sb = new StringBuilder();
+                var sb = new StringBuilder();
                 sb.AppendLine(value);
                 sb.AppendLine("Stack trace:");
-                StackTrace trace = new StackTrace(8, true);
+
+                var trace = new StackTrace(8, true);
                 foreach (StackFrame stackFrame in trace.GetFrames())
                 {
                     MemberInfo methodInfo = stackFrame.GetMethod();
@@ -146,13 +137,13 @@ private void AddLogEntry(string value)
                         type = methodInfo.DeclaringType.FullName;
                     }
 
-                    sb.AppendLine(string.Format("   at {0}.{1} line {2}", type, methodInfo.Name, stackFrame.GetFileLineNumber()));
+                    sb.AppendLine($"   at {type}.{methodInfo.Name} line {stackFrame.GetFileLineNumber()}");
                 }
 
                 value = sb.ToString();
             }
 
-            LoggingService.LogVerbose("RGB(0, 128, 192)SqlQuery", value);
+            Log.LogVerbose("RGB(0, 128, 192)SqlQuery", value);
         }
     }
 }