Merge pull request #63 from xebia/bug/schedule-fails-silently

Bug/schedule fails silently

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.1.3
+
+### Features and improvements
+* Scheduled cleanup now logs a message at start and finish. This enables users to validate their schedule configuration.
+
+### Bugfixes
+* Errors during cleanup schedule no longer fail without logging an error.
+* Fixes bug where runs are no longer cleaned up when there are multiple projects defined in VisualReview
+
 ## 0.1.2
 
 ### Features and improvements

src/main/clojure/com/xebia/visualreview/schedule.clj

@@ -3,23 +3,32 @@
             [slingshot.slingshot :as ex]
             [clojure.tools.logging :as log]
             [com.xebia.visualreview.service.cleanup :as cleanup]
-            [com.xebia.visualreview.service.persistence.database :as db]))
+            [com.xebia.visualreview.service.persistence.database :as db]
+            [com.xebia.visualreview.service.service-util :as sutil]))
 
 (defn- try-catch-all [form]
   (ex/try+
     ~form
     (catch Object o#
-      (log/debug "Caught exception while running task"))))
+      (log/warn "Caught exception while running task" ~o#))
+    (catch Exception e
+      (log/warn "Caught exception while running task" e))))
 
 (defn generate-cleanup-task
   []
   {:id       :cleanup-orphans-task
    :handler  (fn [t opts]
-               (do
-                 (log/debug "Running cleanup task..")
-                 (try-catch-all (cleanup/cleanup-old-runs! db/conn))
-                 (try-catch-all (cleanup/cleanup-orphans! db/conn))
-                 (log/debug "..cleanup task ended")))
+               (ex/try+
+                 (sutil/attempt
+                   (do
+                     (log/info "Running cleanup task..")
+                     (cleanup/cleanup-old-runs! db/conn)
+                     (cleanup/cleanup-orphans! db/conn)
+                     (log/info "..cleanup task ended"))
+                   "Something went wrong during scheduled cleanup: %s"
+                   :cleanup-error)
+                 (catch Object o
+                   (log/error (:message o)))))
    :schedule (:cleanup-schedule com.xebia.visualreview.config/env)
    :opts     {}})
 

src/main/clojure/com/xebia/visualreview/service/suite.clj

@@ -82,7 +82,7 @@
     ::delete-by-id-failed))
 
 (def ^:private get-run-ids-per-suite-sql
-  "SELECT run.suite_id, GROUP_CONCAT(id ORDER BY START_TIME DESC SEPARATOR ',') as runids from RUN")
+  "SELECT run.suite_id, GROUP_CONCAT(id ORDER BY START_TIME DESC SEPARATOR ',') as runids from RUN GROUP BY SUITE_ID")
 (defn get-run-ids-per-suite
   "Returns {:suite-id <suite-id> :run-ids (lazy seq of run ids ordered by start-date desc)}"
   [conn]