ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: nginx: Make logging level configurable.

Browse source 
* gnu/services/web.scm (<nginx-configuration>)[log-level]: New field.
(assert-valid-log-level): New procedure.
(default-nginx-config): Make log-level configurable.
* doc/guix.texi (Web Services): Document it.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Bruno Victal 2023-04-03 12:58:02 +01:00 committed by Maxim Cournoyer
parent 55350a87aa
commit dd10ba4184
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/guix.texi
View file

@ -29889,6 +29889,11 @@ started.
@item @code{log-directory} (default: @code{"/var/log/nginx"}) @item @code{log-directory} (default: @code{"/var/log/nginx"})
The directory to which NGinx will write log files. The directory to which NGinx will write log files.
@item @code{log-level} (default: @code{'error}) (type: symbol)
Logging level, which can be any of the following values: @code{'debug},
@code{'info}, @code{'notice}, @code{'warn}, @code{'error}, @code{'crit},
@code{'alert}, or @code{'emerg}.
@item @code{run-directory} (default: @code{"/var/run/nginx"}) @item @code{run-directory} (default: @code{"/var/run/nginx"})
The directory in which NGinx will create a pid file, and write temporary The directory in which NGinx will create a pid file, and write temporary
files. files.

19
gnu/services/web.scm
View file

@ -15,6 +15,7 @@
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro> ;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2022 Simen Endsjø <simendsjo@gmail.com> ;;; Copyright © 2022 Simen Endsjø <simendsjo@gmail.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -51,6 +52,8 @@ (define-module (gnu services web)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
#:use-module (gnu packages mail) #:use-module (gnu packages mail)
#:use-module (gnu packages rust-apps) #:use-module (gnu packages rust-apps)
#:autoload (guix i18n) (G_)
#:use-module (guix diagnostics)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix modules) #:use-module (guix modules)
@ -61,6 +64,7 @@ (define-module (gnu services web)
#:use-module ((guix packages) #:select (package-version)) #:use-module ((guix packages) #:select (package-version))
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-9) #:use-module (srfi srfi-9)
#:use-module (srfi srfi-34)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 format) #:use-module (ice-9 format)
#:export (httpd-configuration #:export (httpd-configuration
@ -96,6 +100,7 @@ (define-module (gnu services web)
nginx-configuration-nginx nginx-configuration-nginx
nginx-configuration-shepherd-requirement nginx-configuration-shepherd-requirement
nginx-configuration-log-directory nginx-configuration-log-directory
nginx-configuration-log-level
nginx-configuration-run-directory nginx-configuration-run-directory
nginx-configuration-server-blocks nginx-configuration-server-blocks
nginx-configuration-upstream-blocks nginx-configuration-upstream-blocks
@ -562,6 +567,9 @@ (define-record-type* <nginx-configuration>
(default '())) ;list of symbols (default '())) ;list of symbols
(log-directory nginx-configuration-log-directory ;string (log-directory nginx-configuration-log-directory ;string
(default "/var/log/nginx")) (default "/var/log/nginx"))
(log-level nginx-configuration-log-level
(sanitize assert-valid-log-level)
(default 'error))
(run-directory nginx-configuration-run-directory ;string (run-directory nginx-configuration-run-directory ;string
(default "/var/run/nginx")) (default "/var/run/nginx"))
(server-blocks nginx-configuration-server-blocks (server-blocks nginx-configuration-server-blocks
@ -584,6 +592,14 @@ (define-record-type* <nginx-configuration>
(file nginx-configuration-file ;#f | string | file-like (file nginx-configuration-file ;#f | string | file-like
(default #f))) (default #f)))
(define (assert-valid-log-level level)
"Ensure @var{level} is one of @code{'debug}, @code{'info}, @code{'notice},
@code{'warn}, @code{'error}, @code{'crit}, @code{'alert}, or @code{'emerg}."
(unless (memq level '(debug info notice warn error crit alert emerg))
(raise
(formatted-message (G_ "unknown log level '~a'~%") level)))
level)
(define (config-domain-strings names) (define (config-domain-strings names)
"Return a string denoting the nginx config representation of NAMES, a list "Return a string denoting the nginx config representation of NAMES, a list
of domain names." of domain names."
@ -692,6 +708,7 @@ (define (default-nginx-config config)
(match-record config (match-record config
<nginx-configuration> <nginx-configuration>
(nginx log-directory run-directory (nginx log-directory run-directory
log-level
server-blocks upstream-blocks server-blocks upstream-blocks
server-names-hash-bucket-size server-names-hash-bucket-size
server-names-hash-bucket-max-size server-names-hash-bucket-max-size
@ -704,7 +721,7 @@ (define (default-nginx-config config)
(flatten (flatten
"user nginx nginx;\n" "user nginx nginx;\n"
"pid " run-directory "/pid;\n" "pid " run-directory "/pid;\n"
"error_log " log-directory "/error.log info;\n" "error_log " log-directory "/error.log " (symbol->string log-level) ";\n"
(map emit-load-module modules) (map emit-load-module modules)
(map emit-global-directive global-directives) (map emit-global-directive global-directives)
"http {\n" "http {\n"