From 1a704ba233523abb29f6ab7f52dfecd702a9bdd8 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Fri, 24 Jul 2026 17:57:54 -0500
Subject: fix(calendar-sync): guard the hourly timer body against repeating
 signals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- The sync timer body ran unguarded from an hourly run-at-time timer.
- A signal in the timezone check or the sync fan-out errored every tick.
- The same error, once an hour, indefinitely.
- Wrapped the body in condition-case; an error is logged, not propagated.
- Also demoted the timezone-change message to the silent log, like the
  module's other timer-path notices — an hourly timer shouldn't spam the echo area.
---
 modules/calendar-sync.el | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'modules')

diff --git a/modules/calendar-sync.el b/modules/calendar-sync.el
index 804d71fa..d504f246 100644
--- a/modules/calendar-sync.el
+++ b/modules/calendar-sync.el
@@ -300,16 +300,28 @@ When called non-interactively with nil, syncs all calendars."
 ;;; Timer management
 
 (defun calendar-sync--sync-timer-function ()
-  "Function called by sync timer.
-Checks for timezone changes and triggers re-sync if detected."
-  (when (calendar-sync--timezone-changed-p)
-    (let ((old-tz (calendar-sync--format-timezone-offset
-                   calendar-sync--last-timezone-offset))
-          (new-tz (calendar-sync--format-timezone-offset
-                   (calendar-sync--current-timezone-offset))))
-      (message "calendar-sync: Timezone change detected (%s → %s), re-syncing..."
-               old-tz new-tz)))
-  (calendar-sync--sync-all-calendars))
+  "Function called by the hourly sync timer.
+Checks for timezone changes and triggers re-sync if detected.
+
+The body is wrapped so a signal — from the timezone check or the sync
+fan-out — is caught and logged rather than propagated: this runs from a
+`run-at-time' timer, and an unguarded error would repeat on every tick,
+once an hour, indefinitely.  The timezone-change notice goes to the silent
+log, not the echo area, since an hourly timer must not spam `message'."
+  (condition-case err
+      (progn
+        (when (calendar-sync--timezone-changed-p)
+          (let ((old-tz (calendar-sync--format-timezone-offset
+                         calendar-sync--last-timezone-offset))
+                (new-tz (calendar-sync--format-timezone-offset
+                         (calendar-sync--current-timezone-offset))))
+            (calendar-sync--log-silently
+             "calendar-sync: Timezone change detected (%s → %s), re-syncing..."
+             old-tz new-tz)))
+        (calendar-sync--sync-all-calendars))
+    (error
+     (calendar-sync--log-silently
+      "calendar-sync: sync timer error: %s" (error-message-string err)))))
 
 ;;;###autoload
 (defun calendar-sync-start ()
-- 
cgit v1.2.3