Changeset 13099

Timestamp:

01/09/2024 07:49:38 AM (17 months ago)

Author:

dd32

Message:

Trac: GitHub PRs: Catch exceptions that occur when attempting to update the trac ticket.

This is usually caused by Trac rejecting the update, either due to the ticket being modified (which we then retry the update a few times) OR the anti-spam blocking the comment.

File:

• sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php

@@ -140 +140 @@
             }
 
-            $trac->update(
-                $pr_data->trac_ticket[1],
-                "''This ticket was mentioned in [{$pr_data->html_url} PR #{$pr_number}] " .
-                    "on [https://github.com/{$pr_repo}/ {$pr_repo}] " .
-                    "by {$authorship}.''" .
-                    ( $pr_description ? "\n{$pr_description}" : '' ),
-                $attributes,  // Attributes changed
-                true // Notify
-            );
+            try {
+                $trac->update(
+                    $pr_data->trac_ticket[1],
+                    "''This ticket was mentioned in [{$pr_data->html_url} PR #{$pr_number}] " .
+                        "on [https://github.com/{$pr_repo}/ {$pr_repo}] " .
+                        "by {$authorship}.''" .
+                        ( $pr_description ? "\n{$pr_description}" : '' ),
+                    $attributes,  // Attributes changed
+                    true // Notify
+                );
+            } catch( \Exception $e ) {
+                // For now, nothing.
+            }
         }
 
@@ -232 +236 @@
 
             if ( ! $is_edit ) {
-                $trac->update(
-                    $t->ticket, $comment_body,
-                    [], false,
-                    $comment_author,
-                    $comment_time
-                );
+                try {
+                    $trac->update(
+                        $t->ticket, $comment_body,
+                        [], false,
+                        $comment_author,
+                        $comment_time
+                    );
+                } catch( \Exception $e ) {
+                    // For now, nothing.
+                }
             } else {
                 // TODO: Need to edit..