Move system-configuration stuff to a component (#33)

* Move system-configuration stuff to a component

* Cleanup

* Handle garbage profiles"

* Remove tests since they aren't needed

bases/agent/src/com/vennbilling/agent/core.clj

@@ -1,11 +1,11 @@
 (ns com.vennbilling.agent.core
   (:gen-class)
   (:require
-    [aero.core :refer [read-config]]
     [clojure.java.io :as io]
     [com.vennbilling.customer.interface :as customer]
     [com.vennbilling.healthcheck.interface :as healthcheck]
     [com.vennbilling.spec.interface :as venn-spec]
+    [com.vennbilling.system.interface :as system]
     [integrant.core :as ig]
     [io.pedestal.log :as log]
     [muuntaja.core :as m]
@@ -19,19 +19,6 @@
     [ring.logger :as logger]))
 
 
-(defmethod aero.core/reader 'ig/ref
-  [_ _ value]
-  (ig/ref value))
-
-
-(defmethod aero.core/reader 'ig/refset
-  [_ _ value]
-  (ig/refset value))
-
-
-(defmethod ig/init-key :system/env [_ env] env)
-
-
 (defmethod ig/init-key :server/http
   [_ {:keys [db] :as opts}]
   (let [handler (atom (delay (:handler opts)))]
@@ -112,36 +99,12 @@
   (ring/router ["" opts routes]))
 
 
-(defonce system (atom nil))
 (def ^:const banner (slurp (io/resource "agent/banner.txt")))
-
-
-(defn- config
-  [opts]
-  (read-config (io/resource "agent/system.edn") opts))
-
-
-(defn stop-app
-  []
-  (log/info :msg "venn agent has shut down successfully")
-  (some-> (deref system) (ig/halt!)))
-
-
-(defn start-app
-  [{:keys [profile] :as opts}]
-
-  (System/setProperty "org.jboss.logging.provider" "slf4j")
-
-  (println "\n" banner)
-  (log/info :msg "venn agent started successfully." :profile profile)
-
-  (->> (config opts)
-       (ig/prep)
-       (ig/init)
-       (reset! system))
-  (.addShutdownHook (Runtime/getRuntime) (Thread. stop-app)))
+(def config-file (io/resource "agent/system.edn"))
 
 
 (defn -main
   [& _]
-  (start-app {:profile :prod}))
+  ;; TODO: Pass profile as args
+  (system/start banner config-file {:profile :prod})
+  (log/info :msg "venn agent started successfully."))

components/system/deps.edn

@@ -0,0 +1,4 @@
+{:paths ["src" "resources"]
+ :deps {}
+ :aliases {:test {:extra-paths ["test"]
+                  :extra-deps {}}}}

components/system/resources/system/.keep

@@ -0,0 +1 @@
+

components/system/resources/system/default.edn

@@ -0,0 +1,3 @@
+{:system/env
+ #profile {:dev :dev
+           :prod :prod}}

components/system/src/com/vennbilling/system/config.clj

@@ -0,0 +1,22 @@
+(ns com.vennbilling.system.config
+  (:require
+    [aero.core :as aero]
+    [integrant.core :as ig]))
+
+
+(defmethod aero.core/reader 'ig/ref
+  [_ _ value]
+  (ig/ref value))
+
+
+(defmethod aero.core/reader 'ig/refset
+  [_ _ value]
+  (ig/refset value))
+
+
+(defmethod ig/init-key :system/env [_ env] env)
+
+
+(defn read-config
+  [config-file opts]
+  (aero/read-config config-file opts))

components/system/src/com/vennbilling/system/interface.clj

@@ -0,0 +1,8 @@
+(ns com.vennbilling.system.interface
+  (:require
+    [com.vennbilling.system.lifecycle :as lifecycle]))
+
+
+(defn start
+  [banner config-file opts]
+  (lifecycle/start banner config-file opts))

components/system/src/com/vennbilling/system/lifecycle.clj

@@ -0,0 +1,40 @@
+(ns com.vennbilling.system.lifecycle
+  (:require
+    [clojure.java.io :as io]
+    [com.vennbilling.system.config :as c]
+    [integrant.core :as ig]))
+
+
+(defonce  system (atom nil))
+
+(def ^:private default-config-file (io/resource "system/default.edn"))
+(def ^:private default-opts {:profile :dev})
+
+
+(defn- valid-profile?
+  [profile]
+  (contains? {:prod true
+              :dev :true} profile))
+
+
+(defn- stop
+  []
+  (some-> (deref system) (ig/halt!)))
+
+
+(defn start
+  [banner config-file opts]
+
+  (when banner
+    (println "\n" banner))
+
+  (let [f (or config-file default-config-file)
+        profile (:profile opts)
+        o (if (valid-profile? profile)
+            opts
+            default-opts)]
+    (->> (c/read-config f o)
+         (ig/prep)
+         (ig/init)
+         (reset! system)))
+  (.addShutdownHook (Runtime/getRuntime) (Thread. stop)))

deps.edn

@@ -17,6 +17,7 @@
            :dev {:extra-deps {poly/spec {:local/root "components/spec"}
                               poly/healthcheck {:local/root "components/healthcheck"}
                               poly/customer {:local/root "components/customer"}
+                              poly/system {:local/root "components/system"}
                               poly/agent {:local/root "bases/agent"}
 
                               integrant/repl {:mvn/version "0.3.3"}

development/src/dev/agent.clj

@@ -4,21 +4,20 @@
     [clojure.java.io :as io]
     [clojure.tools.namespace.repl :as repl]
     [com.vennbilling.agent.core]
+    [com.vennbilling.system.interface]
     [integrant.core :as ig]
     [integrant.repl :refer [prep go halt reset init]]
     [integrant.repl.state]
     [io.pedestal.log :as log]))
 
 
 (def config-file (io/resource "../../../bases/agent/resources/agent/system.edn"))
-(def config (read-config config-file {:profile :dev}))
 
-(integrant.repl/set-prep! #(ig/prep config))
+(integrant.repl/set-prep! #(ig/prep (read-config config-file {:profile :dev})))
 (repl/set-refresh-dirs "../../../bases/agent/src")
 
 (System/setProperty "logback.statusListenerClass" "ch.qos.logback.core.status.OnConsoleStatusListener")
 
-
 (log/debug :msg "agent running in development mode")
 
 

projects/agent/deps.edn

@@ -1,6 +1,7 @@
 {:deps {poly/spec {:local/root "../../components/spec"}
         poly/customer {:local/root "../../components/customer"}
         poly/healthcheck {:local/root "../../components/healthcheck"}
+        poly/system {:local/root "../../components/system"}
 
         poly/agent {:local/root "../../bases/agent"}