about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederick Muriuki Muriithi2024-10-24 14:02:13 +0100
committerArun Isaac2024-10-24 17:36:31 +0100
commit67423d7341d9e13cbdb0afe6fd17432ecebf4b31 (patch)
tree3544c7fee553493c715495f0ec65dd279748b4b7
parent0db031185aad42bcf2e0bf40dc55b21eea04f77b (diff)
downloadgn-machines-67423d7341d9e13cbdb0afe6fd17432ecebf4b31.tar.gz
Add log-level field to genenetwork-configuration.
*
genenetwork/services/genenetwork.scm (<genenetwork-configuration>)[log-level]:
New field.

* genenetwork/services/genenetwork.scm (genenetwork-gunicorn-apps):
Pass --log-level to gunicorn.

Signed-off-by: Arun Isaac <arunisaac@systemreboot.net>
-rw-r--r--genenetwork/services/genenetwork.scm16
1 files changed, 12 insertions, 4 deletions
diff --git a/genenetwork/services/genenetwork.scm b/genenetwork/services/genenetwork.scm
index e04de66..fe101fa 100644
--- a/genenetwork/services/genenetwork.scm
+++ b/genenetwork/services/genenetwork.scm
@@ -102,7 +102,9 @@
   (gn3-secrets genenetwork-configuration-gn3-secrets
                (default "/etc/genenetwork/gn3-secrets.py"))
   (gn-auth-secrets genenetwork-configuration-gn-auth-secrets
-                   (default "/etc/genenetwork")))
+                   (default "/etc/genenetwork"))
+  (log-level genenetwork-configuration-log-level
+             (default 'warning)))
 
 (define-record-type* <gn-uploader-configuration>
   gn-uploader-configuration make-gn-uploader-configuration
@@ -277,7 +279,7 @@ G-expressions or numbers."
 described by @var{config}, a @code{<genenetwork-configuration>}
 object."
   (match-record config <genenetwork-configuration>
-    (genenetwork2 genenetwork3 gn-auth server-name gn-auth-server-name gn2-port gn3-port gn-auth-port sql-uri auth-db xapian-db genotype-files sparql-endpoint gn-sourcecode-directory gn3-data-directory gn2-secrets gn3-secrets gn-auth-secrets)
+    (genenetwork2 genenetwork3 gn-auth server-name gn-auth-server-name gn2-port gn3-port gn-auth-port sql-uri auth-db xapian-db genotype-files sparql-endpoint gn-sourcecode-directory gn3-data-directory gn2-secrets gn3-secrets gn-auth-secrets log-level)
     ;; If we mapped only the mysqld.sock socket file, it would break
     ;; when the external mysqld server is restarted.
     (let* ((database-mapping (file-system-mapping
@@ -360,7 +362,10 @@ object."
                              (file-system-mapping
                               (source gn2-secrets)
                               (target source)
-                              (writable? #t)))))
+                              (writable? #t))))
+             (extra-cli-arguments
+              (list "--log-level"
+                    (string-upcase (symbol->string log-level)))))
             (gunicorn-app
              (name "genenetwork3")
              (package genenetwork3)
@@ -411,7 +416,10 @@ object."
                              (file-system-mapping
                               (source auth-db)
                               (target source)
-                              (writable? #t)))))
+                              (writable? #t))))
+             (extra-cli-arguments
+              (list "--log-level"
+                    (string-upcase (symbol->string log-level)))))
             (gunicorn-app
              (name "gn-auth")
              (package gn-auth)