imp: Add more context to the MailboxEmail errors

Probesys · Jan 10, 2025 · 3d65c4c · 3d65c4c
1 parent 9b7d8b3
commit 3d65c4c
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/assets/stylesheets/utils/text.css b/assets/stylesheets/utils/text.css
@@ -78,6 +78,15 @@
     word-wrap: anywhere;
 }
 
+.pre--formatted {
+    padding: var(--space-small);
+
+    white-space: pre-wrap;
+
+    background-color: var(--color-grey3);
+    border-radius: var(--border-radius);
+}
+
 code {
     padding: 0 0.5rem;
 

diff --git a/src/Entity/MailboxEmail.php b/src/Entity/MailboxEmail.php
@@ -93,6 +93,16 @@ public function getLastError(): ?string
         return $this->lastError;
     }
 
+    public function getLastErrorSummary(): string
+    {
+        if (!$this->lastError) {
+            return '';
+        }
+
+        $splitError = explode("\n", trim($this->lastError));
+        return $splitError[0];
+    }
+
     public function setLastError(string $lastError): self
     {
         $this->lastError = $lastError;

diff --git a/src/MessageHandler/CreateTicketsFromMailboxEmailsHandler.php b/src/MessageHandler/CreateTicketsFromMailboxEmailsHandler.php
@@ -78,12 +78,11 @@ public function __invoke(CreateTicketsFromMailboxEmails $message): void
             try {
                 $this->processMailboxEmail($mailboxEmail);
             } catch (\Exception $e) {
-                $error = $e->getMessage();
-
+                $error = $e->getMessage() . "\n\n" . $e->getTraceAsString();
                 $mailboxEmail->setLastError($error);
                 $this->mailboxEmailRepository->save($mailboxEmail, true);
 
-                $this->logger->error("MailboxEmail #{$mailboxEmail->getId()} error: {$error}");
+                $this->logger->error("MailboxEmail #{$mailboxEmail->getId()} error: {$e->getMessage()}");
             } finally {
                 $lock->release();
             }

diff --git a/templates/mailboxes/index.html.twig b/templates/mailboxes/index.html.twig
@@ -112,10 +112,23 @@
                             </div>
 
                             <div class="cols flow">
-                                <p class="col--extend text--error">
-                                    {{ 'mailboxes.index.emails.error' | trans }}
-                                    {{ mailboxEmail.lastError }}
-                                </p>
+                                <div class="col--extend">
+                                    {% if mailboxEmail.lastErrorSummary == mailboxEmail.lastError %}
+                                        <p class="text--error text--bold">
+                                            {{ 'mailboxes.index.emails.error' | trans }}
+                                            {{ mailboxEmail.lastError }}
+                                        </p>
+                                    {% else %}
+                                        <details>
+                                            <summary class="text--error text--bold">
+                                                {{ 'mailboxes.index.emails.error' | trans }}
+                                                {{ mailboxEmail.lastErrorSummary }}
+                                            </summary>
+
+                                            <pre class="pre--formatted">{{ mailboxEmail.lastError }}</pre>
+                                        </details>
+                                    {% endif %}
+                                </div>
 
                                 <form method="POST" action="{{ path('delete mailbox email', { uid: mailboxEmail.uid }) }}">
                                     <input type="hidden" name="_csrf_token" value="{{ csrf_token('delete mailbox email') }}">