[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-Lib PATCH v4 5/7] logging: Adjust default log-formatter output.
From: |
Maxim Cournoyer |
Subject: |
[Guile-Lib PATCH v4 5/7] logging: Adjust default log-formatter output. |
Date: |
Sun, 25 Feb 2024 09:19:11 -0500 |
The log level is always in uppercase, and its surrounding parentheses
are dropped.
* src/logging/logger.scm (default-log-formatter): Uppercase level and
strip its surrounding parens.
* unit-tests/logging.logger.scm: Adjust expected output accordingly.
---
(no changes since v1)
src/logging/logger.scm | 2 +-
unit-tests/logging.logger.scm | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/logging/logger.scm b/src/logging/logger.scm
index e53661d..6a5b824 100644
--- a/src/logging/logger.scm
+++ b/src/logging/logger.scm
@@ -296,7 +296,7 @@ suitable syntax wrapper (currently left to the user to
implement)."
;; '(standards) Errors').
(line (and=> (assoc-ref source-properties 'line) 1+))
(column (assoc-ref source-properties 'column)))
- (format #f "~a ~@[~a ~](~a): ~a~%"
+ (format #f "~a ~@[~a ~]~:@(~a~): ~a~%"
(strftime "%F %H:%M:%S" (localtime time))
(and (or file-name line column)
(format #f "~@[~a:~]~@[~a:~]~@[~a:~]" file-name line column))
diff --git a/unit-tests/logging.logger.scm b/unit-tests/logging.logger.scm
index d26587c..2093bf2 100644
--- a/unit-tests/logging.logger.scm
+++ b/unit-tests/logging.logger.scm
@@ -30,7 +30,7 @@
(lgr (make <logger> #:handlers (list (make <port-log> #:port
strport)))))
(open-log! lgr)
(log-msg lgr 'CRITICAL "Hello!")
- (assert-equal "(CRITICAL): Hello!\n"
+ (assert-equal "CRITICAL: Hello!\n"
;; skip over the time/date, since that will vary!
(substring (get-output-string strport) 20))))
@@ -41,7 +41,7 @@
(set-default-logger! lgr)
(log-msg 'CRITICAL "Hello!")
(set-default-logger! #f)
- (assert-equal "(CRITICAL): Hello!\n"
+ (assert-equal "CRITICAL: Hello!\n"
;; skip over the time/date, since that will vary!
(substring (get-output-string strport) 20))))
@@ -50,7 +50,7 @@
(lgr (make <logger> #:handlers (list (make <port-log> #:port
strport)))))
(register-logger! "main" lgr)
(log-msg (lookup-logger "main") 'CRITICAL "Hello!")
- (assert-equal "(CRITICAL): Hello!\n"
+ (assert-equal "CRITICAL: Hello!\n"
;; skip over the time/date, since that will vary!
(substring (get-output-string strport) 20))))
--
2.41.0
- [Guile-Lib PATCH v4 0/7] Make log-msg accept source properties for displaying source location, Maxim Cournoyer, 2024/02/25
- [Guile-Lib PATCH v4 1/7] configure.ac: Fix typo in message., Maxim Cournoyer, 2024/02/25
- [Guile-Lib PATCH v4 2/7] Use /bin/sh in update-api script shebang., Maxim Cournoyer, 2024/02/25
- [Guile-Lib PATCH v4 3/7] tests: guile-library.api: Re-generate., Maxim Cournoyer, 2024/02/25
- [Guile-Lib PATCH v4 4/7] logging: Allow passing source properties to `log-msg'., Maxim Cournoyer, 2024/02/25
- [Guile-Lib PATCH v4 5/7] logging: Adjust default log-formatter output.,
Maxim Cournoyer <=
- [Guile-Lib PATCH v4 7/7] logging: Call flush-log at the end of accept-log., Maxim Cournoyer, 2024/02/25
- [Guile-Lib PATCH v4 6/7] logging: Make procedure name available to the log formatter., Maxim Cournoyer, 2024/02/25