diff --git a/src/SenseNet.Tools.Tests/SnLogTests.cs b/src/SenseNet.Tools.Tests/SnLogTests.cs index 1b87709..01376e3 100644 --- a/src/SenseNet.Tools.Tests/SnLogTests.cs +++ b/src/SenseNet.Tools.Tests/SnLogTests.cs @@ -523,57 +523,6 @@ private string GetGuidAndMessageFromTrace(string line) return bindingInfo.Replace("AUDIT ", "").Replace(", Id:-, Path:-", "").Replace("#", "").Replace(":", "").Replace(" ", "|"); } - [TestMethod] - public void SnLog_WriteAndReload_SnEventLogger() - { - var testValue = Guid.NewGuid().ToString(); - - // action - new SnEventLogger("SenseNet", "SenseNetInstrumentation") - .Write(testValue, null, 0, 0, TraceEventType.Information, null, - new Dictionary { { "a", "b" }, { "x", "y" } }); - - // assert - var logs = EventLog.GetEventLogs(); - var log = logs.FirstOrDefault(l => l.LogDisplayName == "SenseNet"); - Assert.IsNotNull(log); - var entries = new List(); - foreach (EventLogEntry entry in log.Entries) - entries.Add(entry); - var lastEntry = entries.Last(); - - var entryData = ParseEventlogEntryData(lastEntry.Message); - - Assert.AreEqual(testValue, entryData["Message"]); - Assert.AreEqual("Information", entryData["Severity"]); - Assert.AreEqual(Environment.MachineName, entryData["Machine"]); - Assert.AreEqual("a - b, x - y", entryData["Extended Properties"]); - } - private Dictionary ParseEventlogEntryData(string text) - { - var result = new Dictionary(); - var fields = text.Split(new[] {Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries); - var index = 0; - while (true) - { - var field = fields[index++]; - var p = field.IndexOf(':'); - var name = field.Substring(0, p); - var value = field.Length > p ? field.Substring(p + 1).Trim() : string.Empty; - if (name != "Extended Properties") - { - result.Add(name, value); - continue; - } - var extendedValue = new StringBuilder(value); - for (int i = index; i < fields.Length; i++) - extendedValue.Append(", ").Append(fields[i]); - result.Add(name, extendedValue.ToString()); - break; - } - return result; - } - [TestMethod] public void SnLog_WriteAndReload_SnSnFileSystemEventLogger() { @@ -683,5 +632,31 @@ public void SnLog_AuditEventWriter() Assert.AreEqual("Msg3, Msg4", writerEntries); } + /* ========================================================================= */ + + private Dictionary ParseEventlogEntryData(string text) + { + var result = new Dictionary(); + var fields = text.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); + var index = 0; + while (true) + { + var field = fields[index++]; + var p = field.IndexOf(':'); + var name = field.Substring(0, p); + var value = field.Length > p ? field.Substring(p + 1).Trim() : string.Empty; + if (name != "Extended Properties") + { + result.Add(name, value); + continue; + } + var extendedValue = new StringBuilder(value); + for (int i = index; i < fields.Length; i++) + extendedValue.Append(", ").Append(fields[i]); + result.Add(name, extendedValue.ToString()); + break; + } + return result; + } } } diff --git a/src/SenseNet.Tools/Diagnostics/SnEventloggerBase.cs b/src/SenseNet.Tools/Diagnostics/SnEventloggerBase.cs index 08f546c..05f346e 100644 --- a/src/SenseNet.Tools/Diagnostics/SnEventloggerBase.cs +++ b/src/SenseNet.Tools/Diagnostics/SnEventloggerBase.cs @@ -19,9 +19,6 @@ public abstract class SnEventloggerBase : IEventLogger public virtual void Write(object message, ICollection categories, int priority, int eventId, TraceEventType severity, string title, IDictionary properties) { - if (severity == TraceEventType.Verbose) - return; - EventLogEntryType entryType; switch (severity) { diff --git a/src/SenseNet.Tools/Diagnostics/SnLog.cs b/src/SenseNet.Tools/Diagnostics/SnLog.cs index 7bdcfc0..239ff71 100644 --- a/src/SenseNet.Tools/Diagnostics/SnLog.cs +++ b/src/SenseNet.Tools/Diagnostics/SnLog.cs @@ -215,20 +215,18 @@ private static void BindLogEntryAndTrace(string message, TraceEventType severity var eventTypeName = severity.ToString().ToUpper(); var traceId = "#" + Guid.NewGuid(); properties["SnTrace"] = traceId; - if (severity <= TraceEventType.Information) // Critical = 1, Error = 2, Warning = 4, Information = 8 - { - SnTrace.Event.Write("{0} {1}: {2}", eventTypeName, traceId, message); - } - else + if(categories.Count == 1 && categories[0] == "Audit") { properties.TryGetValue("Id", out var contentId); properties.TryGetValue("Path", out var path); - - if (categories.Count == 1 && categories[0] == "Audit") - eventTypeName = "AUDIT"; + eventTypeName = "AUDIT"; SnTrace.Event.Write("{0} {1}: {2}, Id:{3}, Path:{4}", eventTypeName, traceId, message, contentId ?? "-", path ?? "-"); } + else + { + SnTrace.Event.Write("{0} {1}: {2}", eventTypeName, traceId, message); + } } private static TraceEventType GetEventType(Exception e)