add logging%get-level and refracture logging%set-level! in (liii logging) (#325)

Author: JackYansongLi

GoldfishStandardLibrary.tmu

@@ -7131,6 +7131,56 @@
     \;
   </goldfish-chunk>
 
+  <\scm-chunk|goldfish/liii/logging.scm|true|true>
+    (define (%set-level! l)
+
+    \ \ (define (check-valid-level val)
+
+    \ \ \ \ (member val '(0 10 20 30 40 50)))
+
+    \ \ 
+
+    \ \ (cond ((integer? l)\ 
+
+    \ \ \ \ \ \ \ \ \ (if (check-valid-level l)
+
+    \ \ \ \ \ \ \ \ \ \ \ \ \ (set! level l)
+
+    \ \ \ \ \ \ \ \ \ \ \ \ \ (value-error "invalid level number" l)))
+
+    \;
+
+    \ \ \ \ \ \ \ \ ((rich-integer :is-type-of l)\ 
+
+    \ \ \ \ \ \ \ \ \ (if (check-valid-level (l :get))
+
+    \ \ \ \ \ \ \ \ \ \ \ \ \ (set! level (l :get))
+
+    \ \ \ \ \ \ \ \ \ \ \ \ \ (value-error "invalid level number" (l :get))))
+
+    \;
+
+    \ \ \ \ \ \ \ \ (else\ 
+
+    \ \ \ \ \ \ \ \ \ (type-error "level should be an integer"))))
+
+    \;
+  </scm-chunk>
+
+  <\scm-chunk|tests/goldfish/liii/logging-test.scm|true|true>
+    (check-catch 'type-error ((logging "app") :set-level! "invalid level"))
+
+    (check-catch 'value-error ((logging "app") :set-level! 60))
+
+    (let* ((logging-get-rich-level (logging "get-rich-level")))
+
+    \ (logging-get-rich-level :set-level! ($ 50))
+
+    \ (check (logging-get-rich-level :get-level) =\<gtr\> "CRITICAL"))
+
+    \;
+  </scm-chunk>
+
   <subsection|构造器>
 
   <\scm-chunk|goldfish/liii/logging.scm|true|true>
@@ -7227,6 +7277,40 @@
     \;
   </goldfish-chunk>
 
+  <paragraph|logging%get-level>
+
+  <\goldfish-chunk|goldfish/liii/logging.scm|true|true>
+    (define (%get-level)
+
+    \ \ (cond
+
+    \ \ \ \ ((= level 0) "NOTSET")
+
+    \ \ \ \ ((= level 10) "DEBUG")
+
+    \ \ \ \ ((= level 20) "INFO")
+
+    \ \ \ \ ((= level 30) "WARNING")
+
+    \ \ \ \ ((= level 40) "ERROR")
+
+    \ \ \ \ ((= level 50) "CRITICAL")))
+
+    \;
+  </goldfish-chunk>
+
+  <\scm-chunk|tests/goldfish/liii/logging-test.scm|true|true>
+    (check ((logging "app") :get-level) =\<gtr\> "WARNING")
+
+    (let* ((logging-get-level (logging "app-get-level")))
+
+    \ \ (logging-get-level :set-level! 50)
+
+    \ \ (check (logging-get-level :get-level) =\<gtr\> "CRITICAL"))
+
+    \;
+  </scm-chunk>
+
   <paragraph|logging%debug?>
 
   <\goldfish-chunk|goldfish/liii/logging.scm|true|true>

goldfish/liii/logging.scm

@@ -34,6 +34,23 @@
    (level integer? WARNING))
 
 
+(define (%set-level! l)
+  (define (check-valid-level val)
+    (member val '(0 10 20 30 40 50)))
+  
+  (cond ((integer? l) 
+         (if (check-valid-level l)
+             (set! level l)
+             (value-error "invalid level number" l)))
+
+        ((rich-integer :is-type-of l) 
+         (if (check-valid-level (l :get))
+             (set! level (l :get))
+             (value-error "invalid level number" (l :get))))
+
+        (else 
+         (type-error "level should be an integer"))))
+
 (define (@apply p-name)
   ;; Check if logger with this name already exists in registry
   (let ((existing-logger (hash-table-ref loggers-registry p-name)))
@@ -64,6 +81,15 @@
           (display line)
           (path-append-text path line)))))
 
+(define (%get-level)
+  (cond
+    ((= level 0) "NOTSET")
+    ((= level 10) "DEBUG")
+    ((= level 20) "INFO")
+    ((= level 30) "WARNING")
+    ((= level 40) "ERROR")
+    ((= level 50) "CRITICAL")))
+
 (define (%debug?)
   (<= level DEBUG))
 

tests/goldfish/liii/logging-test.scm

@@ -3,6 +3,12 @@
         (liii string)
         (liii lang))
 
+(check-catch 'type-error ((logging "app") :set-level! "invalid level"))
+(check-catch 'value-error ((logging "app") :set-level! 60))
+(let* ((logging-get-rich-level (logging "get-rich-level")))
+ (logging-get-rich-level :set-level! ($ 50))
+ (check (logging-get-rich-level :get-level) => "CRITICAL"))
+
 ;; Test @apply: Verify that the same logger instance is returned for the same name
 (let ((logger1 (logging "test-module"))
       (logger2 (logging "test-module")))
@@ -13,6 +19,11 @@
       (logger2 (logging "module-b")))
   (check-false (eq? logger1 logger2)))
 
+(check ((logging "app") :get-level) => "WARNING")
+(let* ((logging-get-level (logging "app-get-level")))
+  (logging-get-level :set-level! 50)
+  (check (logging-get-level :get-level) => "CRITICAL"))
+
 (check-false ((logging "app") :debug?))
 
 (check-false ((logging "app") :info?))