system logs ordered component key start order

Author: awb99

demo/src/demo/super.clj

@@ -1,3 +1,7 @@
 (ns demo.super)
 
 (println "demo.isuper !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+
+
+(def ^:dynamic secret 42)
+

demo/src/demo/system.clj

@@ -0,0 +1,39 @@
+(ns demo.system
+  (:require 
+   [juxt.clip.core :as clip]
+   [demo.super]
+   [modular.system]
+   ))
+
+(-> 'demo.super/secret requiring-resolve)
+
+(-> 'demo.super/secret requiring-resolve deref)
+
+(defn lookup [s]
+  (when-let [v (requiring-resolve s)]
+    (when (var? v)
+      (deref v))))
+
+(+ 1000000
+(lookup 'demo.super/secret)   
+   )
+
+(binding [demo.super/secret 8]
+  (+ 1000000
+     (lookup 'demo.super/secret))
+  )
+
+(def system-config
+  {:components
+   {:c {:start '(concat (clip/ref :b) [:c])}
+    :a {:start {:a 1}}
+    :b {:start [(clip/ref :a) :b]}
+    }})
+
+
+
+(clip/orderby-start system-config)
+
+(clip/start system-config)
+
+(modular.system/start-system system-config)

src/modular/config.clj

@@ -1,45 +1,24 @@
 (ns modular.config
   (:require
-   [taoensso.timbre  :refer [debug info warn error]]
    [modular.config.cprop :refer [load-config-cprop]]
-   [modular.config.watch :refer [watch-config!]]
-   [modular.require :refer [resolve-symbol]]
    [modular.writer :refer [write-edn-private]]))
 
 (defonce config-atom (atom {}))
 
-(defmacro get-in-config-cljs [path]
-  (get-in @config-atom path))
-
 (defn get-in-config [path]
   (get-in @config-atom path))
 
-;(swap! a assoc :comparator comparator)
-
-;; RESOLVE
-
-(defn resolve-config-key [_ path]
-  (if-let [s (get-in-config path)]
-    (if-let [r (resolve-symbol s)]
-      (swap! config-atom assoc-in path r)
-      (error "resolve-error: resolve failed in path: " path))
-    (error "resolve-error: path path not found: " path)))
-
 (defn load-config!
   [app-config]
   (let [config (load-config-cprop app-config)]
     (reset! config-atom config)
-    (write-edn-private "config" @config-atom)
-    (watch-config! config-atom)))
+    (write-edn-private "config" @config-atom)))
 
 (defn add-config [app-config user-config]
   (let [app-config (if (vector? app-config) app-config [app-config])
         user-config (if (vector? user-config) user-config [user-config])]
     (into [] (concat app-config user-config))))
 
-#_(defn get-in [path]
-    (get-in @config-atom path))
-
 (defn set!
   "The config normally gets configured at an application level:
    On app start the config(s) get loaded.

src/modular/config/watch.clj

@@ -27,6 +27,7 @@
   (System/exit 0)
 ;(stop-system {:running-system running-system :system-config system-config})
   )
+
 (defn log-uncaught-exceptions []
   (Thread/setDefaultUncaughtExceptionHandler
    (reify Thread$UncaughtExceptionHandler
@@ -45,8 +46,29 @@
 
 (def system nil)
 
+;; since safely-derive-parts is a private var, we need to extend clip with in-ns
+
+(in-ns 'juxt.clip.core)
+
+(defn orderby-start
+  ([system-config]
+   (orderby-start system-config (keys (:components system-config))))
+  ([system-config component-ks]
+   (let [{:keys [components]} system-config
+         [_ component-chain] (safely-derive-parts components [] component-ks)
+         component-ks-sorted (map first component-chain)]
+     component-ks-sorted)))
+
+(in-ns 'modular.system)
+
+(require '[juxt.clip.core :refer [orderby-start]])
+
+(defn orderby-edn [system-config]
+  (-> system-config :components keys))
+
 (defn start-system [system-config]
-  (info "starting clip services: " (-> system-config :components keys))
+  ;(info "starting clip services (edn order): " (orderby-edn system-config))
+  (info "starting clip services (start order): " (orderby-start system-config))
   (let [running-system (clip/start system-config)
         on-stop (fn []
                   (stop-system {:system-config system-config
@@ -70,6 +92,7 @@
       (read-config aero-opts))) ; opts: :profile :user :resolve
 
 (defn start!
+  "starts a clip system "
   [{:keys [services config profile run]
     :or {profile :default}
     :as arguments}]
@@ -80,7 +103,7 @@
         {:keys [running-system]} (start-system system-config)]
     (if run ;(seq arguments)
       (run-fn run arguments system-config running-system) ;; application run from the command line with arguments.
-      @(promise) ;; application run from the command line, no arguments, keep webserver running.
+      @(promise) ;; application run from the command line, no arguments, keep running.
       )))
 
 ;; CLI ENTRYPOINT

src/modular/system.clj

@@ -1,16 +1,15 @@
 (ns modular.writer
   (:require
    [clojure.java.io :as io]
-   [fipp.clojure]
-   [modular.date :refer [now-str]]))
+   [fipp.clojure]))
 
 ; fast, but no pretty-print (makes it difficult to detect bugs)
 
 #_(defn write [filename data]
     (spit filename  (pr-str data)))
 
 (defn write [filename data]
-  (let [comment (str "; generated by modular on " (now-str) "\r\n")
+  (let [comment "; auto-generated \r\n"
         s (with-out-str
             (fipp.clojure/pprint data {:width 60}))
         s (str comment s)]