Merge pull request #845 from NikCharlebois/Improved-Error-Logging

Out-of-Band Release 1.20.1016.1
microsoft · Oct 16, 2020 · ffc3540 · ffc3540
2 parents 6fd40f1 + 20be467
commit ffc3540
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Change log for Microsoft365DSC
 
-## 1.20.1021.1
+## 1.20.1016.1
 
-* Fixed a permissions issue with the 
+* Fixed a permissions issue with the
   Install-M365DSCDevBranch cmdlet (Issue #699 & #826)
 * DEPENDENCIES
+  * MSCloudLoginAssistant Updated to 1.0.41;
   * SharePointPnPPowerShellOnline Updated to 3.26.2010.0;
 * MISC
   * Improved Error log to include StackTrace for additional

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2020-10-14
+# Generated on: 2020-10-16
 
 @{
 
     # Script module or binary module file associated with this manifest.
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion     = '1.20.1014.1'
+    ModuleVersion     = '1.20.1016.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -93,7 +93,7 @@
         },
         @{
             ModuleName      = "MSCloudLoginAssistant"
-            RequiredVersion = "1.0.40"
+            RequiredVersion = "1.0.41"
         },
         @{
             ModuleName      = "ReverseDSC"

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCLogEngine.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCLogEngine.psm1
@@ -86,37 +86,37 @@ function Add-M365DSCEvent
 
     $LogName = 'M365DSC'
 
-    if ([System.Diagnostics.EventLog]::SourceExists($Source))
-    {
-        $sourceLogName = [System.Diagnostics.EventLog]::LogNameFromSourceName($Source, ".")
-        if ($LogName -ne $sourceLogName)
-        {
-            Write-Verbose -Message "[ERROR] Specified source {$Source} already exists on log {$sourceLogName}"
-            return
-        }
-    }
-    else
+    try
     {
-        if ([System.Diagnostics.EventLog]::Exists($LogName) -eq $false)
+        if ([System.Diagnostics.EventLog]::SourceExists($Source))
         {
-            #Create event log
-            $null = New-EventLog -LogName $LogName -Source $Source
+            $sourceLogName = [System.Diagnostics.EventLog]::LogNameFromSourceName($Source, ".")
+            if ($LogName -ne $sourceLogName)
+            {
+                Write-Verbose -Message "[ERROR] Specified source {$Source} already exists on log {$sourceLogName}"
+                return
+            }
         }
         else
         {
-            [System.Diagnostics.EventLog]::CreateEventSource($Source, $LogName)
+            if ([System.Diagnostics.EventLog]::Exists($LogName) -eq $false)
+            {
+                #Create event log
+                $null = New-EventLog -LogName $LogName -Source $Source
+            }
+            else
+            {
+                [System.Diagnostics.EventLog]::CreateEventSource($Source, $LogName)
+            }
         }
-    }
 
-    try
-    {
         Write-EventLog -LogName $LogName -Source $Source `
             -EventID $EventID -Message $Message -EntryType $EntryType
     }
     catch
     {
         Write-Verbose -Message $_
-        Add-M365DSCEvent -Message $_ -EntryType 'Error' `
-            -EventID 1 -Source $($MyInvocation.MyCommand.Source)
+        $Message = "Could not write to event log"
+        New-M365DSCLogEntry -Error $_ -Message $Message -Source "[M365DSCLogEngine]"
     }
 }