cleanup logging

JohnDuprey · JohnDuprey · commit fd635b66b517 · 2025-05-20T23:23:48.000-04:00
diff --git a/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-CIPPGraphSubscriptionRenewalTimer.ps1 b/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-CIPPGraphSubscriptionRenewalTimer.ps1
@@ -7,11 +7,6 @@ function Start-CIPPGraphSubscriptionRenewalTimer {
     param()
 
     if ($PSCmdlet.ShouldProcess('Start-CIPPGraphSubscriptionRenewalTimer', 'Starting Graph Subscription Renewal Timer')) {
-        try {
-            Write-LogMessage -API 'Scheduler_RenewGraphSubscriptions' -tenant 'none' -message 'Starting Graph Subscription Renewal' -sev Info
-            Invoke-CippGraphWebhookRenewal
-        } catch {
-            Write-LogMessage -API 'Scheduler_RenewGraphSubscriptions' -tenant 'none' -message 'Failed to renew graph subscriptions' -sev Info
-        }
+        Invoke-CippGraphWebhookRenewal
     }
 }
diff --git a/Modules/CIPPCore/Public/Webhooks/Invoke-CIPPGraphWebhookRenewal.ps1 b/Modules/CIPPCore/Public/Webhooks/Invoke-CIPPGraphWebhookRenewal.ps1
@@ -12,6 +12,7 @@ function Invoke-CippGraphWebhookRenewal {
     }
 
     if (($WebhookData | Measure-Object).Count -gt 0) {
+        Write-LogMessage -API 'Scheduler_RenewGraphSubscriptions' -tenant 'none' -message 'Starting Graph Subscription Renewal' -sev Info
         foreach ($UpdateSub in $WebhookData) {
             try {
                 $TenantFilter = $UpdateSub.PartitionKey

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,6 @@ function Start-CIPPGraphSubscriptionRenewalTimer {`
`7`	`7`	`param()`
`8`	`8`
`9`	`9`	`if ($PSCmdlet.ShouldProcess('Start-CIPPGraphSubscriptionRenewalTimer', 'Starting Graph Subscription Renewal Timer')) {`
`10`		`- try {`
`11`		`- Write-LogMessage -API 'Scheduler_RenewGraphSubscriptions' -tenant 'none' -message 'Starting Graph Subscription Renewal' -sev Info`
`12`		`- Invoke-CippGraphWebhookRenewal`
`13`		`- } catch {`
`14`		`- Write-LogMessage -API 'Scheduler_RenewGraphSubscriptions' -tenant 'none' -message 'Failed to renew graph subscriptions' -sev Info`
`15`		`- }`
	`10`	`+ Invoke-CippGraphWebhookRenewal`
`16`	`11`	`}`
`17`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ function Invoke-CippGraphWebhookRenewal {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`if (($WebhookData \| Measure-Object).Count -gt 0) {`
	`15`	`+ Write-LogMessage -API 'Scheduler_RenewGraphSubscriptions' -tenant 'none' -message 'Starting Graph Subscription Renewal' -sev Info`
`15`	`16`	`foreach ($UpdateSub in $WebhookData) {`
`16`	`17`	`try {`
`17`	`18`	`$TenantFilter = $UpdateSub.PartitionKey`