Merge pull request #371 from Badgerati/develop

v1.0.1
Badgerati · Sep 4, 2019 · b10be3a · b10be3a
2 parents 81a828b + d8661e3
commit b10be3a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,5 +1,13 @@
 # Release Notes
 
+## v1.0.1
+
+```plain
+### Bugs
+* #367: If a "server.psd1" file is not present, Logging will not work
+* #368: Logging will attempt to mask everything if no mask patterns are supplied
+```
+
 ## v1.0.0
 
 ```plain

diff --git a/images/example_code_2.png b/images/example_code_2.png
diff --git a/packers/choco/tools/ChocolateyInstall.ps1 b/packers/choco/tools/ChocolateyInstall.ps1
@@ -26,10 +26,12 @@ function Install-PodeModule($path, $version)
     {
         Push-Location (Join-Path $env:ChocolateyPackageFolder 'src')
 
-        New-Item -ItemType Directory -Path (Join-Path $path 'Tools') -Force | Out-Null
+        New-Item -ItemType Directory -Path (Join-Path $path 'Private') -Force | Out-Null
+        New-Item -ItemType Directory -Path (Join-Path $path 'Public') -Force | Out-Null
         New-Item -ItemType Directory -Path (Join-Path $path 'Misc') -Force | Out-Null
 
-        Copy-Item -Path ./Tools/* -Destination (Join-Path $path 'Tools') -Force | Out-Null
+        Copy-Item -Path ./Private/* -Destination (Join-Path $path 'Private') -Force | Out-Null
+        Copy-Item -Path ./Public/* -Destination (Join-Path $path 'Public') -Force | Out-Null
         Copy-Item -Path ./Misc/* -Destination (Join-Path $path 'Misc') -Force | Out-Null
         Copy-Item -Path ./Pode.psm1 -Destination $path -Force | Out-Null
         Copy-Item -Path ./Pode.psd1 -Destination $path -Force | Out-Null

diff --git a/src/Private/Context.ps1 b/src/Private/Context.ps1
@@ -52,6 +52,12 @@ function New-PodeContext
     $ctx.Server.Interval = $Interval
     $ctx.Server.PodeModulePath = (Get-PodeModulePath)
 
+    # basic logging setup
+    $ctx.Server.Logging = @{
+        Enabled = $true
+        Types = @{}
+    }
+
     # check if there is any global configuration
     $ctx.Server.Configuration = Open-PodeConfiguration -ServerRoot $ServerRoot -Context $ctx
 
@@ -265,7 +271,7 @@ function Open-PodeConfiguration
 
     # check the path exists, and load the config
     if (Test-PodePath -Path $configPath -NoStatus) {
-        $config = Import-PowerShellDataFile -Path $configPath
+        $config = Import-PowerShellDataFile -Path $configPath -ErrorAction Stop
         Set-PodeServerConfiguration -Configuration $config.Server -Context $Context
         Set-PodeWebConfiguration -Configuration $config.Web -Context $Context
     }
@@ -297,7 +303,7 @@ function Set-PodeServerConfiguration
     $Context.Server.Logging = @{
         Enabled = !([bool]$Configuration.Logging.Enable)
         Masking = @{
-            Patterns = @($Configuration.Logging.Masking.Patterns)
+            Patterns = (Remove-PodeEmptyItemsFromArray -Array @($Configuration.Logging.Masking.Patterns))
             Mask = (Protect-PodeValue -Value $Configuration.Logging.Masking.Mask -Default '********')
         }
         Types = @{}