From ddee5f27f383ad517b88bc707ffff94efc662161 Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 20 Jul 2018 15:31:29 +0100 Subject: [PATCH] memlogd/logwrite: use the same naming convention as init In e8786d73bb5665b4d548781949e318af6967be03 the logwrite package will automatically append .log to every log. In 5201049f2ccb92d3933ab39f1a1a498c09dda669 the init package will send stderr of a service `s` to a log named `s` and the stdout to `s.out`. Therefore the files we create on disk are `s.log` and `s.out.log`. This patch modifies the memlogd `logwrite` command-line wrapper to use the same convention. Note there is a confusing name clash between `pkg/logwrite` and `cmd/logwrite` in `memlogd` modified here. Signed-off-by: David Scott --- pkg/memlogd/cmd/logwrite/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/memlogd/cmd/logwrite/main.go b/pkg/memlogd/cmd/logwrite/main.go index 707547237..eb99b93d4 100644 --- a/pkg/memlogd/cmd/logwrite/main.go +++ b/pkg/memlogd/cmd/logwrite/main.go @@ -70,11 +70,11 @@ func main() { raddr := net.UnixAddr{Name: serverSocket, Net: "unixgram"} - if err = sendFD(conn, &raddr, name+".stdout", remoteStdoutFd); err != nil { + if err = sendFD(conn, &raddr, name+".out", remoteStdoutFd); err != nil { log.Fatal("fd stdout send failed: ", err) } - if err = sendFD(conn, &raddr, name+".stderr", remoteStderrFd); err != nil { + if err = sendFD(conn, &raddr, name, remoteStderrFd); err != nil { log.Fatal("fd stderr send failed: ", err) }