Skip to content

Commit e01b728

Browse files
JohnDupreyJohnDuprey
committed
Switch timing logs from Write-Information to Write-Debug
Replaced all Write-Information calls for timing output with Write-Debug in authentication, HTTP request, and profile scripts. Updated Enable-CippConsoleLogging to set DebugPreference when CIPP_CONSOLE_LOG_LEVEL is 'Debug'. This change improves control over timing log verbosity and aligns with standard debugging practices.
1 parent f7325ff commit e01b728

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

‎Modules/CIPPCore/Public/Authentication/Test-CIPPAccess.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,13 +435,13 @@ function Test-CIPPAccess {
435435
$AccessTimings['Total'] = $AccessTotalSw.Elapsed.TotalMilliseconds
436436
$AccessTimingsRounded = [ordered]@{}
437437
foreach ($Key in ($AccessTimings.Keys | Sort-Object)) { $AccessTimingsRounded[$Key] = [math]::Round($AccessTimings[$Key], 2) }
438-
Write-Information "#### Access Timings #### $($AccessTimingsRounded | ConvertTo-Json -Compress)"
438+
Write-Debug "#### Access Timings #### $($AccessTimingsRounded | ConvertTo-Json -Compress)"
439439
return @('AllTenants')
440440
}
441441
$AccessTotalSw.Stop()
442442
$AccessTimings['Total'] = $AccessTotalSw.Elapsed.TotalMilliseconds
443443
$AccessTimingsRounded = [ordered]@{}
444444
foreach ($Key in ($AccessTimings.Keys | Sort-Object)) { $AccessTimingsRounded[$Key] = [math]::Round($AccessTimings[$Key], 2) }
445-
Write-Information "#### Access Timings #### $($AccessTimingsRounded | ConvertTo-Json -Compress)"
445+
Write-Debug "#### Access Timings #### $($AccessTimingsRounded | ConvertTo-Json -Compress)"
446446
return $true
447447
}

‎Modules/CIPPCore/Public/Authentication/Test-CIPPAccessUserRole.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function Test-CIPPAccessUserRole {
6666
$UserRoleTimings['Total'] = $UserRoleTotalSw.Elapsed.TotalMilliseconds
6767
$timingsRounded = [ordered]@{}
6868
foreach ($Key in ($UserRoleTimings.Keys | Sort-Object)) { $timingsRounded[$Key] = [math]::Round($UserRoleTimings[$Key], 2) }
69-
Write-Information "#### UserRole Timings #### $($timingsRounded | ConvertTo-Json -Compress)"
69+
Write-Debug "#### UserRole Timings #### $($timingsRounded | ConvertTo-Json -Compress)"
7070
return $User
7171
}
7272

@@ -127,7 +127,7 @@ function Test-CIPPAccessUserRole {
127127
$UserRoleTimings['Total'] = $UserRoleTotalSw.Elapsed.TotalMilliseconds
128128
$timingsRounded = [ordered]@{}
129129
foreach ($Key in ($UserRoleTimings.Keys | Sort-Object)) { $timingsRounded[$Key] = [math]::Round($UserRoleTimings[$Key], 2) }
130-
Write-Information "#### UserRole Timings #### $($timingsRounded | ConvertTo-Json -Compress)"
130+
Write-Debug "#### UserRole Timings #### $($timingsRounded | ConvertTo-Json -Compress)"
131131

132132
return $User
133133
}

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/New-CippCoreRequest.ps1‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function New-CippCoreRequest {
7878
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
7979
$HttpTimingsRounded = [ordered]@{}
8080
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
81-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
81+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
8282
return $Access
8383
}
8484
} catch {
@@ -87,7 +87,7 @@ function New-CippCoreRequest {
8787
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
8888
$HttpTimingsRounded = [ordered]@{}
8989
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
90-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
90+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
9191
return ([HttpResponseContext]@{
9292
StatusCode = [HttpStatusCode]::Forbidden
9393
Body = $_.Exception.Message
@@ -150,7 +150,7 @@ function New-CippCoreRequest {
150150
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
151151
$HttpTimingsRounded = [ordered]@{}
152152
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
153-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
153+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
154154
return ([HttpResponseContext]($HttpResponse | Select-Object -First 1))
155155
} else {
156156
# If no valid response context found, create a default success response
@@ -169,7 +169,7 @@ function New-CippCoreRequest {
169169
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
170170
$HttpTimingsRounded = [ordered]@{}
171171
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
172-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
172+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
173173
return ([HttpResponseContext]@{
174174
StatusCode = [HttpStatusCode]::OK
175175
Body = $Response
@@ -183,7 +183,7 @@ function New-CippCoreRequest {
183183
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
184184
$HttpTimingsRounded = [ordered]@{}
185185
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
186-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
186+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
187187
return ([HttpResponseContext]@{
188188
StatusCode = [HttpStatusCode]::InternalServerError
189189
Body = $_.Exception.Message
@@ -194,7 +194,7 @@ function New-CippCoreRequest {
194194
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
195195
$HttpTimingsRounded = [ordered]@{}
196196
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
197-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
197+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
198198
return ([HttpResponseContext]@{
199199
StatusCode = [HttpStatusCode]::NotFound
200200
Body = 'Endpoint not found'
@@ -205,7 +205,7 @@ function New-CippCoreRequest {
205205
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
206206
$HttpTimingsRounded = [ordered]@{}
207207
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
208-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
208+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
209209
return ([HttpResponseContext]@{
210210
StatusCode = [HttpStatusCode]::PreconditionFailed
211211
Body = 'Request not processed'

‎Modules/CIPPCore/Public/Tools/Enable-CippConsoleLogging.ps1‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ function Enable-CippConsoleLogging {
4040
'Information'
4141
}
4242

43+
if ($env:CIPP_CONSOLE_LOG_LEVEL -eq 'Debug') {
44+
$global:DebugPreference = 'Continue'
45+
}
46+
4347
# Override Write-Information
4448
function global:Write-Information {
4549
[CmdletBinding()]

‎profile.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ $TimingsRounded = [ordered]@{}
134134
foreach ($Key in ($Timings.Keys | Sort-Object)) {
135135
$TimingsRounded[$Key] = [math]::Round($Timings[$Key], 2)
136136
}
137-
Write-Information "#### Profile Load Timings #### $($TimingsRounded | ConvertTo-Json -Compress)"
137+
Write-Debug "#### Profile Load Timings #### $($TimingsRounded | ConvertTo-Json -Compress)"

0 commit comments

Comments
 (0)