diff --git a/core/core.lisp b/core/core.lisp index d0b97f7..44b9d59 100644 --- a/core/core.lisp +++ b/core/core.lisp @@ -74,7 +74,7 @@ (actions ctx))))) (defun add-service (ctx cfg) - (format t "~&add-service: ~s~%" (config:name cfg)) + ;(format t "~&add-service: ~s~%" (config:name cfg)) (with-slots (services) ctx (let ((child (funcall (config:setup cfg) cfg))) (when child diff --git a/logging.lisp b/logging.lisp index 47204ae..293f7ec 100644 --- a/logging.lisp +++ b/logging.lisp @@ -23,7 +23,7 @@ (if (stringp logfile) (setf logfile (util:path-from-string logfile))) (util:ensure-dir logfile) - (format t "~&loglevel: ~s, logfile: ~s~%" loglevel logfile) + ;(format t "~&loglevel: ~s, logfile: ~s~%" loglevel logfile) (setf params (list :sane loglevel :daily logfile)) (if (console cfg) (setf params (cons :console params))) diff --git a/test/config-postgres.lisp b/test/config-postgres.lisp index 3143801..86e3931 100644 --- a/test/config-postgres.lisp +++ b/test/config-postgres.lisp @@ -5,6 +5,11 @@ (config:root :env-keys '(:db-name :db-user :db-password)) +(config:add :logger :class 'logging:config + :loglevel :info + :logfile (t:test-path "scopes-test.log" "log") + :console nil) + (defvar postgres-connect-args (list :database-name (config:from-env :db-name "cltest") :host "localhost" diff --git a/test/config-sqlite.lisp b/test/config-sqlite.lisp index 00caca3..356d7e1 100644 --- a/test/config-sqlite.lisp +++ b/test/config-sqlite.lisp @@ -5,6 +5,11 @@ (config:root :env-keys '(:db-name)) +(config:add :logger :class 'logging:config + :loglevel :info + :logfile (t:test-path "scopes-test.log" "log") + :console nil) + (defvar sqlite-connect-args (list :database-name (namestring diff --git a/test/etc/config-core.lisp b/test/etc/config-core.lisp index 013191d..cd27199 100644 --- a/test/etc/config-core.lisp +++ b/test/etc/config-core.lisp @@ -4,5 +4,10 @@ (config:root) +(config:add :logger :class 'logging:config + :loglevel :info + :logfile (t:test-path "scopes-test.log" "log") + :console nil) + (config:add :test-receiver :setup #'setup) (config:add-action '(:test) #'check-message) diff --git a/test/test-core.lisp b/test/test-core.lisp index 84df833..fa4c88f 100644 --- a/test/test-core.lisp +++ b/test/test-core.lisp @@ -5,6 +5,7 @@ (:local-nicknames (:alx :alexandria) (:config :scopes/config) (:core :scopes/core) + (:logging :scopes/logging) (:message :scopes/core/message) (:util :scopes/util) (:t :scopes/testing)) @@ -48,7 +49,6 @@ (defun run () (let* ((t:*test-suite* (make-instance 'test-suite :name "core"))) - (log4cl:log-config :sane :daily (t:test-path "scopes-test.log" "log")) (load (t:test-path "config-core" "etc")) (unwind-protect (progn diff --git a/test/test-storage.lisp b/test/test-storage.lisp index 7a85847..42d1e15 100644 --- a/test/test-storage.lisp +++ b/test/test-storage.lisp @@ -6,6 +6,7 @@ (:use :common-lisp) (:local-nicknames (:config :scopes/config) (:core :scopes/core) + (:logging :scopes/logging) (:storage :scopes/storage) (:tracking :scopes/storage/tracking) (:t :scopes/testing))