From eb1569287b6cff64378e5f793392db0084d14990 Mon Sep 17 00:00:00 2001
From: Christian Weilbach <ch_weil@topiq.es>
Date: Sat, 13 Apr 2024 07:04:17 +0000
Subject: [PATCH] Improve error handling.

---
 src/ie/simm/runtimes/telegram.clj | 9 ++++++---
 src/ie/simm/simmie.clj            | 5 ++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ie/simm/runtimes/telegram.clj b/src/ie/simm/runtimes/telegram.clj
index 36adf83..c9ff806 100644
--- a/src/ie/simm/runtimes/telegram.clj
+++ b/src/ie/simm/runtimes/telegram.clj
@@ -111,7 +111,10 @@
                     (put? S next-in (assoc m
                                            :type :ie.simm.languages.chat/send-text-reply
                                            :response (try (t/send-text (:telegram-bot-token config) chat-id msg)
-                                                          (catch Exception e
+                                           ;; TODO bug in slingshot forces us to catch Throwable for HTTP errors, 
+                                           ;; https://github.com/scgilardi/slingshot/issues/60
+                                           ;; this can also be resolved by refactoring morse to be more lean
+                                                          (catch Throwable e
                                                             (debug "error sending telegram message:" e)
                                                             e))))
                     (recur (<? S send-text))))
@@ -123,7 +126,7 @@
                                            :type :ie.simm.languages.chat/send-photo-reply
                                            :response (try
                                                        (t/send-photo (:telegram-bot-token config) chat-id url)
-                                                       (catch Exception e
+                                                       (catch Throwable e
                                                          (debug "error sending telegram photo:" e)
                                                          e))))
                     (recur (<? S send-photo))))
@@ -135,7 +138,7 @@
                                            :type :ie.simm.languages.chat/send-document-reply
                                            :response (try
                                                        (t/send-document (:telegram-bot-token config) chat-id url)
-                                                       (catch Exception e
+                                                       (catch Throwable e
                                                          (debug "error sending telegram document:" e)
                                                          e))))
                     (recur (<? S send-document))))
diff --git a/src/ie/simm/simmie.clj b/src/ie/simm/simmie.clj
index 5aef04a..209f727 100644
--- a/src/ie/simm/simmie.clj
+++ b/src/ie/simm/simmie.clj
@@ -1,7 +1,7 @@
 (ns ie.simm.simmie
   (:require [taoensso.timbre :as log]
             [taoensso.timbre.appenders.core :as appenders]
-            [superv.async :refer [S go-try <? <??] :as sasync]
+            [superv.async :refer [S go-try <? <?? on-abort] :as sasync]
             [ie.simm.http :refer [ring-handler]]
             [ring.adapter.jetty :refer [run-jetty]]
             [clojure.core.async :refer [chan close!]]
@@ -30,8 +30,7 @@
                                                     (swap! peer assoc-in [:http :server] server)
                                                     (log/info "Server started.")
                                                     ;; this only unblocks on crash
-                                                    (<? S (chan))
-                                                    (.stop server))))
+                                                    (on-abort S (.stop server)))))
                                   :delay (* 10 1000)
                                   :log-fn (fn [level msg] (log/log level msg)))
     (log/info "Server started.")