diff --git a/doc/shepherd.texi b/doc/shepherd.texi index 810336c..88b39e3 100644 --- a/doc/shepherd.texi +++ b/doc/shepherd.texi @@ -405,7 +405,7 @@ permissions are not as expected. @cindex logging @cindex log file Log output into @var{file}, or if @var{file} is not given, address@hidden/var/log/shepherd.log} when running as superuser, address@hidden/dev/kmsg} when running as superuser (except when this is not possible---then it uses @code{/var/log/shepherd.log}), @code{$XDG_CONFIG_HOME/shepherd/shepherd.log} otherwise. @item address@hidden diff --git a/modules/shepherd.scm b/modules/shepherd.scm index 5334657..6acd41e 100644 --- a/modules/shepherd.scm +++ b/modules/shepherd.scm @@ -141,8 +141,17 @@ ;; Enable logging as first action. (start-logging logfile) + (when (string=? logfile "/dev/kmsg") + ;; Prevent duplicate messages. + (set-current-output-port (%make-void-port "w"))) + ;; Send output to log and clients. - (set-current-output-port shepherd-output-port) + (set-current-output-port + (make-shepherd-output-port (current-output-port))) + + ;; Send errors to log. + (set-current-error-port + (make-shepherd-output-port (current-error-port) (const #f))) ;; Start the 'root' service. (start root-service) diff --git a/modules/shepherd/comm.scm b/modules/shepherd/comm.scm index 0228f63..99b8d04 100644 --- a/modules/shepherd/comm.scm +++ b/modules/shepherd/comm.scm @@ -51,7 +51,8 @@ start-logging stop-logging %current-client-socket - shepherd-output-port)) + %current-logfile-date-format + make-shepherd-output-port)) ;; Command for shepherd. @@ -200,10 +201,18 @@ on service '~a':") ;; Socket of the client currently talking to the daemon. (make-parameter #f)) +;; Every entry in the logfile is prefixed with +;; (strftime %current-logfile-date-format). +(define %current-logfile-date-format + (make-parameter default-logfile-date-format)) + ;; We provide our own output mechanism, because we have certain ;; special needs; most importantly, we want to send output to herd ;; sometimes. -(define (make-shepherd-output-port original-output-port) +(define* (make-shepherd-output-port original-output-port + #:optional + (current-client-socket-thunk + %current-client-socket)) (make-soft-port (vector @@ -216,9 +225,9 @@ on service '~a':") (lambda (str) ;; When herd is connected, send it the output; otherwise, in the ;; unlikely case nobody is listening, send to the standard output. - (if (%current-client-socket) + (if (current-client-socket-thunk) (catch-system-error - (display str (%current-client-socket))) + (display str (current-client-socket-thunk))) (display str original-output-port)) ;; Logfile, buffer line-wise and output time for each @@ -228,7 +237,7 @@ on service '~a':") (let* ((log (lambda (x) (display x log-output-port))) (init-line (lambda () - (log (strftime "%Y-%m-%d %H:%M:%S " + (log (strftime (%current-logfile-date-format) (localtime (current-time))))))) (init-line) (for-each log (reverse buffer)) @@ -259,6 +268,3 @@ on service '~a':") ;; It's an output-only port. "w")) - -(define shepherd-output-port - (make-shepherd-output-port (current-output-port))) diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm index 83600e4..481203d 100644 --- a/modules/shepherd/service.scm +++ b/modules/shepherd/service.scm @@ -728,20 +728,37 @@ false." ;; it for something unrelated, which can confuse some packages. (dup2 (open-fdes "/dev/null" O_RDONLY) 0) - (when log-file - (catch #t - (lambda () - ;; Redirect stout and stderr to use LOG-FILE. - (catch-system-error (close-fdes 1)) - (catch-system-error (close-fdes 2)) - (dup2 (open-fdes log-file (logior O_CREAT O_WRONLY)) 1) - (dup2 (open-fdes log-file (logior O_CREAT O_WRONLY)) 2)) - (lambda (key . args) - (format (current-error-port) - "failed to open log-file ~s:~%" log-file) - (print-exception (current-error-port) #f key args) - (primitive-exit 1)))) - + (if log-file + (catch #t + (lambda () + ;; Redirect stout and stderr to use LOG-FILE. + (catch-system-error (close-fdes 1)) + (catch-system-error (close-fdes 2)) + (dup2 (open-fdes log-file (logior O_CREAT O_WRONLY)) 1) + (dup2 (open-fdes log-file (logior O_CREAT O_WRONLY)) 2)) + (lambda (key . args) + (format (current-error-port) + "failed to open log-file ~s:~%" log-file) + (print-exception (current-error-port) #f key args) + (primitive-exit 1))) + (catch #t + (lambda () + ;; Make sure the child has stdout/stderr that can be used. + ;; We sometimes set current-error-port to a softport. + ;; libguile would then autoconnect /dev/null - + ;; which we don't want. + ;; Also, cryptsetup interactively asks for a password, + ;; so we don't want /dev/kmsg either. + ;; In a user shepherd all this is not necessary - + ;; but then, port->fdes will not fail. + (when (not (false-if-exception (port->fdes (current-output-port)))) + (dup2 (open-fdes "/dev/console" (logior O_WRONLY)) 1)) + (when (not (false-if-exception (port->fdes (current-error-port)))) + (dup2 (open-fdes "/dev/console" (logior O_WRONLY)) 2))) + (lambda (key . args) + (format (current-error-port) "failed to open stdout/stderr\n") + (print-exception (current-error-port) #f key args) + (primitive-exit 1)))) (let loop ((i 3)) (when (< i max-fd) ;; First try to close any ports associated with file descriptor I. diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm index bb01edc..585aef9 100644 --- a/modules/shepherd/support.scm +++ b/modules/shepherd/support.scm @@ -22,6 +22,7 @@ (define-module (shepherd support) #:use-module (shepherd config) #:use-module (ice-9 match) + #:use-module (ice-9 format) #:export (call/ec caught-error assert @@ -43,6 +44,7 @@ user-homedir default-logfile + default-logfile-date-format default-config-file default-socket-dir default-socket-file @@ -282,9 +284,16 @@ TARGET should be a string representing a filepath + name." ;; Logfile. (define default-logfile (if (zero? (getuid)) - (string-append %localstatedir "/log/shepherd.log") + (if (access? "/dev/kmsg" W_OK) + "/dev/kmsg" + (string-append %localstatedir "/log/shepherd.log")) (string-append %user-config-dir "/shepherd.log"))) +(define default-logfile-date-format + (if (and (zero? (getuid)) (string=? default-logfile "/dev/kmsg")) + (format #f "shepherd[~d]: " (getpid)) + "%Y-%m-%d %H:%M:%S ")) + ;; Configuration file. (define (default-config-file) "Return the default configuration file---either the user's file, or the