From 78e9c3b5eb6ba18373b4410da07044625eeba9a3 Mon Sep 17 00:00:00 2001 From: Emanuele Filardo Date: Wed, 23 Oct 2019 11:27:30 +0200 Subject: [PATCH 1/5] fix for logmanager nullexception when values is null --- Oqtane.Server/Infrastructure/LogManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 30768523..4c664c7a 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -93,7 +93,7 @@ namespace Oqtane.Infrastructure if (message.IndexOf("}", index) != -1) { names.Add(message.Substring(index + 1, message.IndexOf("}", index) - index - 1)); - if (values.Length > (names.Count - 1)) + if (values.Length > (names.Count - 1) && values[names.Count - 1] != null) { message = message.Replace("{" + names[names.Count - 1] + "}", values[names.Count - 1].ToString()); } From 5ecea339fd2d9c00379d6f61c3196ca79f17b9b2 Mon Sep 17 00:00:00 2001 From: Emanuele Filardo Date: Wed, 23 Oct 2019 14:06:06 +0200 Subject: [PATCH 2/5] log preserve and evidence null value --- Oqtane.Server/Infrastructure/LogManager.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 4c664c7a..66eae47d 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -93,9 +93,16 @@ namespace Oqtane.Infrastructure if (message.IndexOf("}", index) != -1) { names.Add(message.Substring(index + 1, message.IndexOf("}", index) - index - 1)); - if (values.Length > (names.Count - 1) && values[names.Count - 1] != null) + if (values.Length > (names.Count - 1)) { - message = message.Replace("{" + names[names.Count - 1] + "}", values[names.Count - 1].ToString()); + if (values[names.Count - 1] != null) + { + message = message.Replace("{" + names[names.Count - 1] + "}", values[names.Count - 1].ToString()); + } + else + { + message = message.Replace("{" + names[names.Count - 1] + "}", "with Null " + names[names.Count - 1]); + } } } index = message.IndexOf("{", index + 1); @@ -122,6 +129,7 @@ namespace Oqtane.Infrastructure } Log.Message = message; Log.Properties = properties; + System.Diagnostics.Debug.WriteLine(message); return Log; } } From e51e9797a4251ac76ac1f15e9627e11b27593a16 Mon Sep 17 00:00:00 2001 From: Emanuele Filardo Date: Wed, 23 Oct 2019 14:26:59 +0200 Subject: [PATCH 3/5] improve readility of messagge with property name Remove not necessary line --- Oqtane.Server/Infrastructure/LogManager.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 66eae47d..47aee78d 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -97,7 +97,7 @@ namespace Oqtane.Infrastructure { if (values[names.Count - 1] != null) { - message = message.Replace("{" + names[names.Count - 1] + "}", values[names.Count - 1].ToString()); + message = message.Replace("{" + names[names.Count - 1] + "}", names[names.Count - 1] + ":" + values[names.Count - 1].ToString()); } else { @@ -129,7 +129,6 @@ namespace Oqtane.Infrastructure } Log.Message = message; Log.Properties = properties; - System.Diagnostics.Debug.WriteLine(message); return Log; } } From 83876bcad22c12c453a832e6f68706d8926ebe93 Mon Sep 17 00:00:00 2001 From: Emanuele Filardo Date: Wed, 23 Oct 2019 19:09:24 +0200 Subject: [PATCH 4/5] if value is null don't execute .ToString() and replace {property} with "null" --- Oqtane.Server/Infrastructure/LogManager.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 47aee78d..e21a571a 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -95,14 +95,7 @@ namespace Oqtane.Infrastructure names.Add(message.Substring(index + 1, message.IndexOf("}", index) - index - 1)); if (values.Length > (names.Count - 1)) { - if (values[names.Count - 1] != null) - { - message = message.Replace("{" + names[names.Count - 1] + "}", names[names.Count - 1] + ":" + values[names.Count - 1].ToString()); - } - else - { - message = message.Replace("{" + names[names.Count - 1] + "}", "with Null " + names[names.Count - 1]); - } + message = message.Replace("{" + names[names.Count - 1] + "}", names[names.Count - 1] + ":" + values[names.Count - 1]?.ToString() ?? "null"); } } index = message.IndexOf("{", index + 1); From a625d3e6f566d64b5f8ef8ea6771fc8f300c600c Mon Sep 17 00:00:00 2001 From: Emanuele Filardo Date: Wed, 23 Oct 2019 19:16:44 +0200 Subject: [PATCH 5/5] remove property name --- Oqtane.Server/Infrastructure/LogManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index e21a571a..8622abec 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -95,7 +95,7 @@ namespace Oqtane.Infrastructure names.Add(message.Substring(index + 1, message.IndexOf("}", index) - index - 1)); if (values.Length > (names.Count - 1)) { - message = message.Replace("{" + names[names.Count - 1] + "}", names[names.Count - 1] + ":" + values[names.Count - 1]?.ToString() ?? "null"); + message = message.Replace("{" + names[names.Count - 1] + "}", values[names.Count - 1]?.ToString() ?? "null"); } } index = message.IndexOf("{", index + 1);