Merge pull request #158 from kit-clj/graceful-shutdown

stop app, then shutdown agents in a single hook

Author: yogthos

libs/deps-template/resources/io/github/kit_clj/kit/src/clj/core.clj

@@ -48,5 +48,4 @@
 
 (defn -main [& _]
   (start-app)
-  (.addShutdownHook (Runtime/getRuntime) (Thread. stop-app))
-  (.addShutdownHook (Runtime/getRuntime) (Thread. shutdown-agents)))
+  (.addShutdownHook (Runtime/getRuntime) (Thread. (fn [] (stop-app) (shutdown-agents)))))

libs/kit-generator/test/resources/core.clj

@@ -28,16 +28,15 @@
 
 (defn stop-app []
   ((or (:stop defaults) (fn [])))
-  (some-> (deref system) (ig/halt!))
-  (shutdown-agents))
+  (some-> (deref system) (ig/halt!)))
 
 (defn start-app [& [params]]
   ((or (:start params) (:start defaults) (fn [])))
   (->> (config/system-config (or (:opts params) (:opts defaults) {}))
        (ig/expand)
        (ig/init)
        (reset! system))
-  (.addShutdownHook (Runtime/getRuntime) (Thread. stop-app)))
+  (.addShutdownHook (Runtime/getRuntime) (Thread. (fn [] (stop-app) (shutdown-agents)))))
 
 (defn -main [& _]
   (start-app))