Allow child message lookup by text instead of name (which is null for…

… messages)
KirillOsenkov · Jun 16, 2017 · 63dedaa · 63dedaa
1 parent d97255a
commit 63dedaa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/StructuredLogger/ObjectModel/ChildrenList.cs b/src/StructuredLogger/ObjectModel/ChildrenList.cs
@@ -20,7 +20,7 @@ public T FindNode<T>(string name) where T : NamedNode
             {
                 for (int i = 0; i < Count; i++)
                 {
-                    if (this[i] is T t && t.Name == name)
+                    if (this[i] is T t && t.LookupKey == name)
                     {
                         childrenCache[key] = t;
                         return t;
@@ -41,14 +41,14 @@ private void EnsureCacheCreated()
 
         public void OnAdded(NamedNode child)
         {
-            if (child?.Name == null)
+            if (child?.LookupKey == null)
             {
                 return;
             }
 
             EnsureCacheCreated();
 
-            var key = new ChildrenCacheKey(child.GetType(), child.Name);
+            var key = new ChildrenCacheKey(child.GetType(), child.LookupKey);
             childrenCache[key] = child;
         }
 

diff --git a/src/StructuredLogger/ObjectModel/Message.cs b/src/StructuredLogger/ObjectModel/Message.cs
@@ -9,6 +9,8 @@ public class Message : TextNode, IHasRelevance
         /// </summary>
         public DateTime Timestamp { get { return DateTime.MinValue; } set { } }
 
+        public override string LookupKey => Text;
+
         private bool isLowRelevance = false;
         public bool IsLowRelevance
         {

diff --git a/src/StructuredLogger/ObjectModel/NamedNode.cs b/src/StructuredLogger/ObjectModel/NamedNode.cs
@@ -4,6 +4,7 @@ public class NamedNode : TreeNode
     {
         public string Name { get; set; }
 
+        public virtual string LookupKey => Name;
         public override string ToString() => Name;
     }
 }
diff --git a/src/StructuredLogger/ObjectModel/TreeNode.cs b/src/StructuredLogger/ObjectModel/TreeNode.cs
@@ -140,7 +140,7 @@ public virtual T FindChild<T>(string name) where T : NamedNode
                 return list.FindNode<T>(name);
             }
 
-            return FindChild<T>(c => c.Name == name);
+            return FindChild<T>(c => c.LookupKey == name);
         }
 
         public virtual T FindChild<T>(Predicate<T> predicate)