working on dev

moclojer · Dec 10, 2024 · 0d0184a · 0d0184a
1 parent 7f477b1
commit 0d0184a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 34 deletions.
diff --git a/src/back/api/server.clj b/src/back/api/server.clj
@@ -19,19 +19,19 @@
    :sentry (component/using (components/new-sentry) [:config])
    :router (components/new-router routes/routes)
    :database (component/using (components/new-database) [:config])
-   :mq (component/using (components/new-mq
-                         p.workers/workers
-                         [{:channel "domains.verification.fired"
-                           :event {}
-                           ;; every 2 minutes
-                           :sleep 120000}
-                          {:channel "yml.unified.verification.fired"
-                           :event {}
-                           ;; every 5 minutes
-                           :sleep 300000}]
-
-                         false)
-                        [:config :database :sentry])
+   :mq (component/using
+        (components/new-mq
+         p.workers/workers
+         [{:channel "domains.verification.fired"
+           :event {}
+           ;; every 2 minutes
+           :sleep 120000}
+          {:channel "yml.unified.verification.fired"
+           :event {}
+           ;; every 5 minutes
+           :sleep 300000}]
+         false)
+        [:config :database :sentry])
    :webserver (component/using (components/new-webserver)
                                [:config :http :router :database :mq :sentry])))
 
@@ -40,13 +40,14 @@
   (->> system-map
        component/start
        (reset! system-atom))
-  (trace-all-ns))
+  (trace-all-ns @system-atom))
 
 (defn stop-system! []
   (logs/log :info "stopping system")
   (swap!
    system-atom
-   (fn [s] (when s (component/stop s)))))
+   (fn [s]
+     (when s (component/stop s)))))
 
 (defn -main
   "The entry-point for 'gen-class'"

diff --git a/src/dev/api/dev.clj b/src/dev/api/dev.clj
@@ -14,6 +14,7 @@
 
 (defn build-system-map []
   (component/system-map
+   :env :prod
    :config (components/new-config "back/config.edn")
    :logger (component/using (components/new-logger) [:config])
    :sentry (components/new-sentry-mock)
@@ -35,14 +36,14 @@
         [:config :database :sentry])
    :webserver (component/using
                (components/new-webserver)
-               [:config :http :router :database :mq])))
+               [:config :http :router :database :mq :sentry])))
 
 (comment
   ;; init
   (utils/start-system-dev! sys-atom (build-system-map))
 
-  (component/start
-   (:logger @sys-atom))
+  (:logger @sys-atom)
+  (:env (:config (:config (:logger @sys-atom))))
 
   (mq/try-op! (:mq @sys-atom) :publish! ["yml.unified.verification.fired" {}] {})
   (mq/try-op! (:mq @sys-atom) :publish! ["domains.verification.fired" {}] {})

diff --git a/src/dev/utils.clj b/src/dev/utils.clj
@@ -27,17 +27,15 @@
        (doseq [[sym v] (ns-interns curr-ns)]
          (when (and (var? v) (fn? @v))
            (let [arglists (-> v meta :arglists first)
-                 arg-names (map keyword (or arglists []))
-                 solved-fn (str curr-ns "/" sym)
-                 traced-fn (fn [f]
-                             (fn [n]
-                               (com.moclojer.components.logs/trace
-                                ::traced-fn
-                                (zipmap arg-names n)
-                                (f n))))]
-             (swap! fn-names conj solved-fn)
+                 arg-names (map keyword (or arglists []))]
+             (swap! fn-names conj (str curr-ns "/" sym))
              (try
-               (alter-var-root v traced-fn)
+               (alter-var-root v (fn [f]
+                                   (fn [& args]
+                                     (logs/trace
+                                      ::traced-fn
+                                      (zipmap arg-names args) 
+                                      (apply f args))))) 
                (catch Exception e
                  (println "Failed to trace" sym (.getMessage e))))))))
      (utils/inspect-if (= env :dev) @fn-names))))
@@ -52,7 +50,7 @@
    (->> sys-map
         component/start
         (reset! sys-atom))
-   (trace-all-ns (utils/inspect (:logger @sys-atom)))))
+   (trace-all-ns @sys-atom)))
 
 (defn stop-system-dev!
   ([sys-atom]
@@ -70,12 +68,12 @@
   (trace-all-ns {:config {:env :prod}})
 
   (let [args []]
-    (com.moclojer.components.logs/trace
+    (logs/trace
      ::traced-fn
      {:test? :test}
      (trace-all-ns args)))
 
-  (com.moclojer.components.logs/trace
+  (logs/trace
    ::testing-stuff
    {:testing? :definitely}
    (get-allowed-ns)))
diff --git a/src/job_ops/server.clj b/src/job_ops/server.clj
@@ -16,7 +16,7 @@
         [:config :sentry])))
 
 (defn start-system! [system-map]
-  (components/setup-logger [["*" :info]] :auto :prod)
+  #_(components/setup-logger [["*" :info]] :auto :prod)
   (->> system-map
        component/start
        (reset! system-atom)))

diff --git a/test/back/back/integration/components/utils.clj b/test/back/back/integration/components/utils.clj
@@ -1,14 +1,12 @@
 (ns back.integration.components.utils
   (:require
    [com.stuartsierra.component :as component]
-   [com.moclojer.components.logs :as logs]
    [com.moclojer.components.migrations :as migrations]
    [pg-embedded-clj.core :as pg-emb]))
 
 (defn start-system!
   [system-start-fn]
   (fn []
-    (logs/setup :info :auto :dev)
     (pg-emb/init-pg)
     (migrations/migrate (migrations/build-complete-db-config "back/config.edn"))
     (system-start-fn)))