From 84900141c95bdf8e4fb874eaf22527248dbec69a Mon Sep 17 00:00:00 2001
From: James Truher <jimtru@microsoft.com>
Date: Mon, 2 Aug 2021 11:57:32 -0700
Subject: [PATCH 1/3] Add more information when a parsing error occurs

---
 test/tools/Modules/PSSysLog/PSSysLog.psm1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/tools/Modules/PSSysLog/PSSysLog.psm1 b/test/tools/Modules/PSSysLog/PSSysLog.psm1
index 660e98226b2..37566d24c4d 100644
--- a/test/tools/Modules/PSSysLog/PSSysLog.psm1
+++ b/test/tools/Modules/PSSysLog/PSSysLog.psm1
@@ -302,7 +302,7 @@ class PSLogItem
         }
         else
         {
-            Write-Warning -Message "Could not split EventId $($item.EventId) on '[] ' Count:$($subparts.Count)"
+            Write-Warning -Message "Could not split EventId $($item.EventId) on '[] ' Count:$($subparts.Count) -> $content"
         }
 
         # (commitid:TID:ChannelID)
@@ -317,7 +317,7 @@ class PSLogItem
         }
         else
         {
-            Write-Warning -Message "Could not split CommitId $($item.CommitId) on '(): ' Count:$($subparts.Count)"
+            Write-Warning -Message "Could not split CommitId $($item.CommitId) on '(): ' Count:$($subparts.Count) -> $content"
         }
 
         # nameid[PID]
@@ -331,7 +331,7 @@ class PSLogItem
         }
         else
         {
-            Write-Warning -Message "Could not split LogId $($item.LogId) on '[]:' Count:$($subparts.Count)"
+            Write-Warning -Message "Could not split LogId $($item.LogId) on '[]:' Count:$($subparts.Count) -> $content"
         }
 
         return $item

From 35132c4a575e9db99ee6ee444fea3c0a0785fbeb Mon Sep 17 00:00:00 2001
From: James Truher <jimtru@microsoft.com>
Date: Tue, 3 Aug 2021 11:43:44 -0700
Subject: [PATCH 2/3] protect the conversion to psloginfo with a try/catch

---
 test/tools/Modules/PSSysLog/PSSysLog.psm1 | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/tools/Modules/PSSysLog/PSSysLog.psm1 b/test/tools/Modules/PSSysLog/PSSysLog.psm1
index 37566d24c4d..4bd48780f7b 100644
--- a/test/tools/Modules/PSSysLog/PSSysLog.psm1
+++ b/test/tools/Modules/PSSysLog/PSSysLog.psm1
@@ -497,11 +497,16 @@ function ConvertFrom-SysLog
     {
         foreach ($line in $Content)
         {
-            [PSLogItem] $item = [PSLogItem]::ConvertSysLog($line, $id, $after)
-            if ($item -ne $null)
-            {
-                $totalWritten++
-                Write-Output $item
+            try {
+                [PSLogItem] $item = [PSLogItem]::ConvertSysLog($line, $id, $after)
+                if ($item -ne $null)
+                {
+                    $totalWritten++
+                    Write-Output $item
+                }
+            }
+            catch {
+                Write-Warning -Message "Could not convert '$line' to PSLogItem"
             }
         }
     }

From a33b0d1a6c8868252405076257db298a23f8a410 Mon Sep 17 00:00:00 2001
From: Robert Holt <rjmholt_msft@outlook.com>
Date: Wed, 4 Aug 2021 10:20:01 -0700
Subject: [PATCH 3/3] Update test/tools/Modules/PSSysLog/PSSysLog.psm1

---
 test/tools/Modules/PSSysLog/PSSysLog.psm1 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/tools/Modules/PSSysLog/PSSysLog.psm1 b/test/tools/Modules/PSSysLog/PSSysLog.psm1
index 4bd48780f7b..00dd74be5af 100644
--- a/test/tools/Modules/PSSysLog/PSSysLog.psm1
+++ b/test/tools/Modules/PSSysLog/PSSysLog.psm1
@@ -497,7 +497,8 @@ function ConvertFrom-SysLog
     {
         foreach ($line in $Content)
         {
-            try {
+            try
+            {
                 [PSLogItem] $item = [PSLogItem]::ConvertSysLog($line, $id, $after)
                 if ($item -ne $null)
                 {
@@ -505,7 +506,8 @@ function ConvertFrom-SysLog
                     Write-Output $item
                 }
             }
-            catch {
+            catch
+            {
                 Write-Warning -Message "Could not convert '$line' to PSLogItem"
             }
         }