Merge branch 'dev'

# Conflicts:
#	Logging/targets/WebexTeams.ps1

Author: EsOsO

Logging/Logging.psd1

@@ -69,7 +69,7 @@ Description = 'Powershell Logging Module'
 # NestedModules = @()
 
 # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
-# FunctionsToExport = @('Use-LogMessage','Add-LoggingLevel','Add-LoggingTarget','Get-LoggingMessageCount','Get-LoggingCallerScope','Get-LoggingDefaultFormat','Get-LoggingDefaultLevel','Get-LoggingTarget','Get-LoggingAvailableTarget','Set-LoggingCallerScope','Set-LoggingCustomTarget','Set-LoggingDefaultFormat','Set-LoggingDefaultLevel','Wait-Logging','Write-Log')
+FunctionsToExport = @('Add-LoggingLevel','Add-LoggingTarget','Get-LoggingAvailableTarget','Get-LoggingCallerScope','Get-LoggingDefaultFormat','Get-LoggingDefaultLevel','Get-LoggingTarget','Set-LoggingCallerScope','Set-LoggingCustomTarget','Set-LoggingDefaultFormat','Set-LoggingDefaultLevel','Wait-Logging','Write-Log')
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
 CmdletsToExport = @()

Logging/private/Start-LoggingManager.ps1

@@ -55,9 +55,11 @@ function Start-LoggingManager {
                             Invoke-Command -ScriptBlock $Logger -ArgumentList @($Log, $TargetConfiguration)
                         }
                     }
-                } catch {
+                }
+                catch {
                     $ParentHost.UI.WriteErrorLine($_)
-                } finally {
+                }
+                finally {
                     $ParentHost.NotifyEndApplication()
                 }
             }
@@ -70,22 +72,18 @@ function Start-LoggingManager {
 
     #region Handle Module Removal
     $OnRemoval = {
-        $Script:LoggingEventQueue.CompleteAdding()
-        $Script:LoggingEventQueue.Dispose()
-
-        [void] $Script:LoggingRunspace.Powershell.EndInvoke($LoggingRunspace.Handle)
-        [void] $Script:LoggingRunspace.Powershell.Dispose()
-
-        Remove-Variable Logging -Scope Script -Force
-        Remove-Variable Defaults -Scope Script -Force
-        Remove-Variable LevelNames -Scope Script -Force
-        Remove-Variable LoggingRunspace -Scope Script -Force
-        Remove-Variable LoggingEventQueue -Scope Script -Force
+        (Get-Module Logging).Invoke({
+                Wait-Logging
+                Stop-LoggingManager
+            })
 
         [System.GC]::Collect()
     }
 
+    # This scriptblock would be called within the module scope
     $ExecutionContext.SessionState.Module.OnRemove += $OnRemoval
-    Register-EngineEvent -SourceIdentifier ([System.Management.Automation.PsEngineEvent]::Exiting) -Action $OnRemoval
+
+    # This scriptblock would be called within the global scope and wouldn't have access to internal module variables and functions that we need
+    $Script:LoggingRunspace.EngineEvent = Register-EngineEvent -SourceIdentifier ([System.Management.Automation.PsEngineEvent]::Exiting) -Action $OnRemoval
     #endregion Handle Module Removal
 }

Logging/targets/WebexTeams.ps1

@@ -1,35 +1,35 @@
 @{
-    Name = 'WebexTeams'
+    Name          = 'WebexTeams'
     Configuration = @{
         BotToken = @{Required = $true; Type = [string]; Default = $null }
-        RoomID = @{Required = $true; Type = [string]; Default = $null }
-        Icons   = @{Required = $false; Type = [hashtable]; Default = @{
+        RoomID   = @{Required = $true; Type = [string]; Default = $null }
+        Icons    = @{Required = $false; Type = [hashtable]; Default = @{
                 'ERROR'   = '🚨'
                 'WARNING' = '⚠️'
                 'INFO'    = 'ℹ️'
                 'DEBUG'   = '🔎'
             }
         }
-        Level   = @{Required = $false; Type = [string]; Default = $Logging.Level}
-        Format  = @{Required = $false; Type = [string]; Default = $Logging.Format}
+        Level    = @{Required = $false; Type = [string]; Default = $Logging.Level }
+        Format   = @{Required = $false; Type = [string]; Default = $Logging.Format }
     }
-    Logger = {
+    Logger        = {
         param(
             [hashtable] $Log,
             [hashtable] $Configuration
         )
         # Build the Message body
         $body = @{
-          roomId=$Configuration.RoomId
-          text=$Configuration.Icons[$Log.Level]+" "+$(Replace-Token -String $Configuration.Format -Source $Log)
+            roomId = $Configuration.RoomId
+            text   = $Configuration.Icons[$Log.Level] + " " + $(Replace-Token -String $Configuration.Format -Source $Log)
         }
 
         # Convert to JSON
-        $json=$body | ConvertTo-Json
+        $json = $body | ConvertTo-Json
         # Send Message to Cisco Webex API - UTF8 Handling for Emojiis
         Invoke-RestMethod -Method Post `
-          -Headers @{"Authorization"="Bearer $($Configuration.BotToken)"} `
-          -ContentType "application/json" -Body ([System.Text.Encoding]::UTF8.GetBytes($json)) `
-          -Uri "https://api.ciscospark.com/v1/messages"
+            -Headers @{"Authorization" = "Bearer $($Configuration.BotToken)" } `
+            -ContentType "application/json" -Body ([System.Text.Encoding]::UTF8.GetBytes($json)) `
+            -Uri "https://api.ciscospark.com/v1/messages"
     }
 }

docs/RELEASE.md

@@ -0,0 +1,5 @@
+
+- [NEW] added target for Azure Log Analytics Workspace (thx to @manualbashing)
+- [NEW] added target for Webex Teams (thx to @itshorty)
+- [FIX] fixed module autoload (thx to @Tadas)
+- [FIX] module don't hang shell exit (thx to @Tadas) #82