Skip to content

Commit 8b327c5

Browse files
NowinskiKNowinskiK
committed
Function's name provided for "Write-Message" is not needed anymore #84 
1 parent 7985e78 commit 8b327c5

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

‎source/Private/Test-FabricApiResponse.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function Test-FabricApiResponse {
7171
[switch] $ExtractValue = $false
7272
)
7373

74-
Write-Message -Message "[Test-FabricApiResponse]::Begin" -Level Debug
74+
Write-Message -Message "::Begin" -Level Debug
7575

7676
#$responseHeader = $script:responseHeader
7777
#$statusCode = $script:statusCode
@@ -93,7 +93,7 @@ function Test-FabricApiResponse {
9393
[string]$operationId = $responseHeader["x-ms-operation-id"]
9494

9595
if ($NoWait) {
96-
Write-Message -Message "NoWait parameter is set. Operation ID: $operationId" -Level Info
96+
Write-Message -Message "NoWait parameter is set. Operation ID: $operationId" -Level Debug
9797
Write-Message -Message "Run to check the progress: Get-FabricLongRunningOperationResult -operationId '$operationId'" -Level Verbose
9898
return [PSCustomObject]@{
9999
Location = $responseHeader["Location"]
@@ -102,11 +102,11 @@ function Test-FabricApiResponse {
102102
}
103103
}
104104

105-
Write-Message -Message "[Test-FabricApiResponse] Operation ID: '$operationId'" -Level Debug
106-
Write-Message -Message "[Test-FabricApiResponse] Getting Long Running Operation status" -Level Debug
105+
Write-Message -Message "Operation ID: '$operationId'" -Level Debug
106+
Write-Message -Message "Getting Long Running Operation status" -Level Debug
107107

108108
$operationStatus = Get-FabricLongRunningOperation -operationId $operationId
109-
Write-Message -Message "[Test-FabricApiResponse] Long Running Operation status: $operationStatus" -Level Debug
109+
Write-Message -Message "Long Running Operation status: $operationStatus" -Level Debug
110110
# Handle operation result
111111
if ($operationStatus.status -eq "Succeeded") {
112112
Write-Message -Message "Operation Succeeded" -Level Debug
@@ -156,7 +156,7 @@ function Test-FabricApiResponse {
156156
Write-Message -Message $msg -Level $level
157157
# }
158158

159-
Write-Message -Message "[Test-FabricApiResponse]::End" -Level Debug
159+
Write-Message -Message "::End" -Level Debug
160160

161161
# Return the "value" object if exists, otherwise return the response directly
162162
if ($result -and $ExtractValue) {

‎source/Private/Write-Message.ps1

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,18 @@ function Write-Message {
5454
$timestamp = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
5555

5656
# Construct log message
57-
$logMessage = "[$timestamp] [$Level] $Message"
57+
$logMessage = $Message
58+
$fn = (Get-PSCallStack)[1].Command
5859

5960
# Write log message to console with colors
6061
switch ($Level) {
61-
"Message" { Write-Host $logMessage -ForegroundColor White }
62-
"Info" { Write-Host $logMessage -ForegroundColor Green }
63-
"Error" { Write-Error $logMessage }
64-
"Warning" { Write-Warning $logMessage }
65-
"Critical" { Write-Host $logMessage -ForegroundColor Red } # Or maybe Stop-PSFunction here?
66-
"Verbose" { Write-Verbose $logMessage }
67-
"Debug" { Write-Debug $logMessage }
62+
"Message" { Write-PSFMessage -Message $logMessage -FunctionName $fn -Level Host }
63+
"Info" { Write-PSFMessage -Message $logMessage -FunctionName $fn -Level Important }
64+
"Error" { Write-PSFMessage -Message $logMessage -FunctionName $fn -Level Error }
65+
"Warning" { Write-PSFMessage -Message $logMessage -FunctionName $fn -Level Warning }
66+
"Critical" { Write-PSFMessage -Message $logMessage -FunctionName $fn -Level Critical }
67+
"Verbose" { Write-PSFMessage -Message $logMessage -FunctionName $fn -Level Verbose }
68+
"Debug" { Write-PSFMessage -Message $logMessage -FunctionName $fn -Level Debug }
6869
}
6970

7071
# Optionally write log message to a file
@@ -77,7 +78,7 @@ function Write-Message {
7778
}
7879
}
7980
} catch {
80-
Write-Host "[ERROR] An unexpected error occurred: $_" -ForegroundColor Red
81+
Stop-PSFFunction -Message "An unexpected error occurred while writing the message to log file." -ErrorRecord $_ -Level Error
8182
}
8283
}
8384
}

‎source/Public/Invoke-FabricRestMethod.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Function Invoke-FabricRestMethod {
7878
[string] $SuccessMessage
7979
)
8080

81-
Write-Message -Message "[Invoke-FabricRestMethod]::Begin" -Level Debug
81+
Write-Message -Message "::Begin" -Level Debug
8282

8383
if ($TestTokenExpired) {
8484
Confirm-TokenState
@@ -98,11 +98,11 @@ Function Invoke-FabricRestMethod {
9898

9999
if ($Body -is [hashtable]) {
100100
$Body = $Body | ConvertTo-Json -Depth 10
101-
Write-Message -Message "[Invoke-FabricRestMethod] Request Body: $Body" -Level Debug
101+
Write-Message -Message "Request Body: $Body" -Level Debug
102102
} elseif ($Body -is [string]) {
103-
Write-Message -Message "[Invoke-FabricRestMethod] Request Body: $Body" -Level Debug
103+
Write-Message -Message "Request Body: $Body" -Level Debug
104104
} else {
105-
Write-Message -Message "[Invoke-FabricRestMethod] No request body provided." -Level Debug
105+
Write-Message -Message "No request body provided." -Level Debug
106106
}
107107

108108
$request = @{
@@ -118,9 +118,9 @@ Function Invoke-FabricRestMethod {
118118
}
119119
$response = Invoke-RestMethod @request
120120

121-
Write-Message -Message "[Invoke-FabricRestMethod] Result response code: $statusCode" -Level Debug
121+
Write-Message -Message "Result response code: $statusCode" -Level Debug
122122
if ($response) {
123-
Write-Message -Message "[Invoke-FabricRestMethod] Result return: $response" -Level Debug
123+
Write-Message -Message "Result return: $response" -Level Debug
124124
}
125125
# Needed for backward compatibility, example: Get-FabricWorkspace
126126
$script:statusCode = $statusCode
@@ -140,6 +140,6 @@ Function Invoke-FabricRestMethod {
140140
$response = Test-FabricApiResponse @params
141141
}
142142

143-
Write-Message -Message "[Invoke-FabricRestMethod]::End" -Level Debug
143+
Write-Message -Message "::End" -Level Debug
144144
$response
145145
}

0 commit comments

Comments
 (0)