Skip to content

Commit

Permalink
Updated logging.
Browse files Browse the repository at this point in the history
  • Loading branch information
ryugi committed Jun 5, 2017
1 parent 00115ac commit d259203
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/clj/timi/server/components/cli.clj
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
(let [cfg (get-in component [:cfg-mgr :cfg])
server (cli-server/serve cfg)]
(log/trace "Using config:" cfg)
(log/debug "Component keys:" (keys component))
(log/trace "Component keys:" (keys component))
(log/debug "Successfully created server:" server)
(assoc component :cli server)))

(stop [component]
(log/info "Stopping CLI server ...")
(log/debug "Component keys" (keys component))
(log/trace "Component keys" (keys component))
(when-let [server (:cli component)]
(log/debug "Using server object:" server)
(server))
Expand Down
4 changes: 2 additions & 2 deletions src/clj/timi/server/components/config.clj
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
(log/info "Starting configuration manager ...")
(let [cfg (read-config config-file)]
(log/trace "Using config:" cfg)
(log/debug "Component keys:" (keys component))
(log/trace "Component keys:" (keys component))
(log/debug "Successfully created manager.")
(assoc component :cfg cfg)))

(stop [component]
(log/info "Stopping configuration manager ...")
(log/debug "Component keys" (keys component))
(log/trace "Component keys" (keys component))
(assoc component :cfg nil)))

(defn new-config-manager []
Expand Down
4 changes: 2 additions & 2 deletions src/clj/timi/server/components/db.clj
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
conn (jdbc/get-connection db-spec)]
(log/trace "Using config:" cfg)
(log/debug "Using db spec:" db-spec)
(log/debug "Component keys:" (keys component))
(log/trace "Component keys:" (keys component))
(log/debug "Successfully created database manager.")
(assoc component
:db-spec db-spec
:conn conn)))

(stop [component]
(log/info "Stopping database manager ...")
(log/debug "Component keys" (keys component))
(log/trace "Component keys" (keys component))
component))

(defn new-db-manager []
Expand Down
7 changes: 4 additions & 3 deletions src/clj/timi/server/components/httpd.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
http-cfg (:httpd app-cfg)
handler (inject-app (app-handler-fn app-cfg) component)
server (httpkit/run-server handler http-cfg)]
(log/debug "Using config:" http-cfg)
(log/debug "Component keys:" (keys component))
(log/trace "Using config:" app-cfg)
(log/debug "Using HTTP config:" http-cfg)
(log/trace "Component keys:" (keys component))
(log/debug "Successfully created server:" server)
(assoc component :httpd server)))

(stop [component]
(log/info "Stopping HTTP server ...")
(log/debug "Component keys" (keys component))
(log/trace "Component keys" (keys component))
(if-let [server (:httpd component)]
(do (log/debug "Using server object:" server)
(server))) ; calling server like this stops it, if started
Expand Down
4 changes: 2 additions & 2 deletions src/clj/timi/server/components/logging.clj
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
(let [cfg (get-in component [:cfg-mgr :cfg])]
(util/set-log-level cfg :app)
(log/trace "Using config:" cfg)
(log/debug "Component keys:" (keys component))
(log/trace "Component keys:" (keys component))
(log/debug "Successfully created logger.")
component))

(stop [component]
(log/info "Stopping logger ...")
(log/debug "Component keys" (keys component))
(log/trace "Component keys" (keys component))
component))

(defn new-logger []
Expand Down

0 comments on commit d259203

Please sign in to comment.