[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30498] [PATCH shepherd] shepherd: If /dev/kmsg is writable, use it
From: |
Danny Milosavljevic |
Subject: |
[bug#30498] [PATCH shepherd] shepherd: If /dev/kmsg is writable, use it for logging. |
Date: |
Sat, 17 Feb 2018 13:20:35 +0100 |
* modules/shepherd.scm (main): If /dev/kmsg is used, don't log to console
again - use only /dev/kmsg.
* modules/shepherd/comm.scm (%current-logfile-date-format): New variable.
(make-shepherd-output-port): Use it. Export.
* modules/shepherd/support.scm (default-logfile-date-format): New variable.
(default-logfile): Use /dev/kmsg if writable.
(default-logfile-date-format): Drop duplicate timestamp.
---
modules/shepherd.scm | 6 +++++-
modules/shepherd/comm.scm | 11 ++++++-----
modules/shepherd/support.scm | 11 ++++++++++-
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/modules/shepherd.scm b/modules/shepherd.scm
index 5334657..2db56a1 100644
--- a/modules/shepherd.scm
+++ b/modules/shepherd.scm
@@ -141,8 +141,12 @@
;; Enable logging as first action.
(start-logging logfile)
+ (if (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)))
;; Start the 'root' service.
(start root-service)
diff --git a/modules/shepherd/comm.scm b/modules/shepherd/comm.scm
index 0228f63..6cea6f0 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,6 +201,9 @@ on service '~a':")
;; Socket of the client currently talking to the daemon.
(make-parameter #f))
+(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.
@@ -228,7 +232,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 +263,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/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
- [bug#30498] [PATCH shepherd] shepherd: If /dev/kmsg is writable, use it for logging.,
Danny Milosavljevic <=
- [bug#30498] [PATCH shepherd] shepherd: If /dev/kmsg is writable, use it for logging., Danny Milosavljevic, 2018/02/17
- [bug#30498] [WIP v2 shepherd] shepherd: If /dev/kmsg is writable, use it for logging., Danny Milosavljevic, 2018/02/17
- [bug#30498] [WIP v2 shepherd] shepherd: If /dev/kmsg is writable, use it for logging., Danny Milosavljevic, 2018/02/17
- [bug#30498] [WIP v2 shepherd] shepherd: If /dev/kmsg is writable, use it for logging., Ludovic Courtès, 2018/02/26
- [bug#30498] [WIP v2 shepherd] shepherd: If /dev/kmsg is writable, use it for logging., Danny Milosavljevic, 2018/02/26
- [bug#30498] [WIP v2 shepherd] shepherd: If /dev/kmsg is writable, use it for logging., Ludovic Courtès, 2018/02/27