Reverting back to version before adding settings.ps1 file.

raandree · raandree · commit 4bb6a6bc3e77 · 2019-02-18T10:54:29.000+01:00
diff --git a/AutomatedLab/settings.psd1 b/AutomatedLab/settings.psd1
@@ -37,17 +37,6 @@
                 }
             }
         )
-        Logging                                = @{
-            TruncateLength = 50
-            TruncateTypes  = @(
-                'System.Management.Automation.ScriptBlock'
-            )
-            DefaultFolder  = $null
-            DefaultName    = 'PSLog'
-            Level          = 'All'
-            Silent         = $false
-            AutoStart      = $true
-        }
         MachineFileName                        = 'Machines.xml'
         DiskFileName                           = 'Disks.xml'
         LabFileName                            = 'Lab.xml'
diff --git a/PSLog/PSLog.psd1 b/PSLog/PSLog.psd1
@@ -19,5 +19,15 @@
     
     ModuleList                = @('PSLog')
     
-    PrivateData               = @{ }
+    PrivateData               = @{
+        AutoStart           = $true
+        DefaultFolder       = $null
+        DefaultName         = 'PSLog'
+        Level               = 'All'
+        Silent              = $false
+        TruncateTypes       = @(
+            'System.Management.Automation.ScriptBlock'
+        )
+        TruncateLength      = 50
+    }
 }
diff --git a/PSLog/PSLog.psm1 b/PSLog/PSLog.psm1
@@ -31,7 +31,7 @@ function Start-Log
 
     if ($UseDefaults)
     {
-        $script:defaults = Get-LabConfigurationItem -Name Logging
+        $script:defaults = $MyInvocation.MyCommand.Module.PrivateData
         if (-not $defaults.DefaultFolder)
         {
             $LogPath = [Environment]::GetFolderPath('MyDocuments')
@@ -207,7 +207,7 @@ function Write-LogFunctionEntry
 
     if (!$Log)
     {
-        if ($(Get-LabConfigurationItem -Name Logging).AutoStart)
+        if ($MyInvocation.MyCommand.Module.PrivateData.AutoStart)
         {
             Write-Verbose 'starting log'
             Start-Log -UseDefaults
@@ -310,7 +310,7 @@ function Write-LogFunctionExit
 
     if (!$Log)
     {
-        if ($(Get-LabConfigurationItem -Name Logging).AutoStart)
+        if ($MyInvocation.MyCommand.Module.PrivateData.AutoStart)
         {
             Start-Log -UseDefaults
         }
@@ -381,7 +381,7 @@ function Write-LogFunctionExitWithError
 
     if (!$Log)
     {
-        if ($(Get-LabConfigurationItem -Name Logging).AutoStart)
+        if ($MyInvocation.MyCommand.Module.PrivateData.AutoStart)
         {
             Start-Log -UseDefaults
         }
@@ -467,7 +467,7 @@ function Write-LogError
 
     if (!$Log)
     {
-        if ($(Get-LabConfigurationItem -Name Logging).AutoStart)
+        if ($MyInvocation.MyCommand.Module.PrivateData.AutoStart)
         {
             Start-Log -UseDefaults
         }

Original file line number	Diff line number	Diff line change
`@@ -37,17 +37,6 @@`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`)`
`40`		`- Logging = @{`
`41`		`- TruncateLength = 50`
`42`		`- TruncateTypes = @(`
`43`		`- 'System.Management.Automation.ScriptBlock'`
`44`		`- )`
`45`		`- DefaultFolder = $null`
`46`		`- DefaultName = 'PSLog'`
`47`		`- Level = 'All'`
`48`		`- Silent = $false`
`49`		`- AutoStart = $true`
`50`		`- }`
`51`	`40`	`MachineFileName = 'Machines.xml'`
`52`	`41`	`DiskFileName = 'Disks.xml'`
`53`	`42`	`LabFileName = 'Lab.xml'`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ function Start-Log`
`31`	`31`
`32`	`32`	`if ($UseDefaults)`
`33`	`33`	`{`
`34`		`- $script:defaults = Get-LabConfigurationItem -Name Logging`
	`34`	`+ $script:defaults = $MyInvocation.MyCommand.Module.PrivateData`
`35`	`35`	`if (-not $defaults.DefaultFolder)`
`36`	`36`	`{`
`37`	`37`	`$LogPath = [Environment]::GetFolderPath('MyDocuments')`
`@@ -207,7 +207,7 @@ function Write-LogFunctionEntry`
`207`	`207`
`208`	`208`	`if (!$Log)`
`209`	`209`	`{`
`210`		`- if ($(Get-LabConfigurationItem -Name Logging).AutoStart)`
	`210`	`+ if ($MyInvocation.MyCommand.Module.PrivateData.AutoStart)`
`211`	`211`	`{`
`212`	`212`	`Write-Verbose 'starting log'`
`213`	`213`	`Start-Log -UseDefaults`
`@@ -310,7 +310,7 @@ function Write-LogFunctionExit`
`310`	`310`
`311`	`311`	`if (!$Log)`
`312`	`312`	`{`
`313`		`- if ($(Get-LabConfigurationItem -Name Logging).AutoStart)`
	`313`	`+ if ($MyInvocation.MyCommand.Module.PrivateData.AutoStart)`
`314`	`314`	`{`
`315`	`315`	`Start-Log -UseDefaults`
`316`	`316`	`}`
`@@ -381,7 +381,7 @@ function Write-LogFunctionExitWithError`
`381`	`381`
`382`	`382`	`if (!$Log)`
`383`	`383`	`{`
`384`		`- if ($(Get-LabConfigurationItem -Name Logging).AutoStart)`
	`384`	`+ if ($MyInvocation.MyCommand.Module.PrivateData.AutoStart)`
`385`	`385`	`{`
`386`	`386`	`Start-Log -UseDefaults`
`387`	`387`	`}`
`@@ -467,7 +467,7 @@ function Write-LogError`
`467`	`467`
`468`	`468`	`if (!$Log)`
`469`	`469`	`{`
`470`		`- if ($(Get-LabConfigurationItem -Name Logging).AutoStart)`
	`470`	`+ if ($MyInvocation.MyCommand.Module.PrivateData.AutoStart)`
`471`	`471`	`{`
`472`	`472`	`Start-Log -UseDefaults`
`473`	`473`	`}`