clean up logic

src/metabase/events/metabot_lifecycle.clj

@@ -27,12 +27,19 @@
   (when-let [{topic :topic object :item} metabot-lifecycle-event]
     (try
       ;; if someone updated our slack-token, or metabot was enabled/disabled then react accordingly
-      (let [{:keys [slack-token metabot-enabled]} object]
-        (cond
-          (and (contains? object :metabot-enabled)
-               (not metabot-enabled))      (metabot/stop-metabot!)
-          (and (contains? object :slack-token)
-               (seq slack-token))                  (metabot/start-metabot!)))
+      (when (and (contains? object :metabot-enabled) (contains? object :slack-token))
+        
+        (let [{:keys [slack-token metabot-enabled]} object]
+          (cond
+            (nil? slack-token) (metabot/stop-metabot!) 
+            (not metabot-enabled)  (metabot/stop-metabot!)
+            :else (metabot/restart-metabot!))))
+      ; (let [{:keys [slack-token metabot-enabled]} object]
+      ;   (cond
+      ;     (and (contains? object :metabot-enabled)
+      ;          (not metabot-enabled))      (metabot/stop-metabot!)
+      ;     (and (contains? object :slack-token)
+      ;          (seq slack-token))                  (metabot/start-metabot!)))
       (catch Throwable e
         (log/warn (format "Failed to process driver notifications event. %s" topic) e)))))
 

src/metabase/metabot.clj

@@ -317,3 +317,13 @@
   (log/info "Stopping MetaBot...  🤖")
   (reset! websocket-monitor-thread-id nil)
   (disconnect-websocket!))
+
+(defn restart-metabot! 
+  "Restart the Metaot. 
+   Used on settings changed"
+  []
+  (when @websocket-monitor-thread-id
+    (log/info "Metabot already running. Killing the previous WebSocket listener first.")
+    (stop-metabot!))
+  (start-metabot!)
+  )