github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3126 from djs55/logwrite-extension

Browse Source 
memlogd/logwrite: use the same naming convention as init
This commit is contained in:
Rolf Neugebauer 2018-07-20 20:08:44 +01:00 committed by GitHub
commit 8dcddf6be4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/logging.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/runc:v0.5 - linuxkit/runc:v0.5
- linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24
- linuxkit/ca-certificates:v0.5 - linuxkit/ca-certificates:v0.5
- linuxkit/memlogd:v0.5 - linuxkit/memlogd:ba4fcf55c35a3833546a1e39125bf0fa940327b0
onboot: onboot:
- name: sysctl - name: sysctl
image: linuxkit/sysctl:v0.5 image: linuxkit/sysctl:v0.5

4
pkg/memlogd/cmd/logwrite/main.go
View File

@ -70,11 +70,11 @@ func main() {
raddr := net.UnixAddr{Name: serverSocket, Net: "unixgram"} 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) 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) log.Fatal("fd stderr send failed: ", err)
} }

2
test/cases/040_packages/030_logwrite/test.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:v0.5 - linuxkit/runc:v0.5
- linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24
- linuxkit/ca-certificates:v0.5 - linuxkit/ca-certificates:v0.5
- linuxkit/memlogd:v0.5 - linuxkit/memlogd:ba4fcf55c35a3833546a1e39125bf0fa940327b0
services: services:
# A service which generates logs of log messages # A service which generates logs of log messages
- name: fill-the-logs - name: fill-the-logs

2
test/cases/040_packages/031_kmsg/test.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:v0.5 - linuxkit/runc:v0.5
- linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24
- linuxkit/ca-certificates:v0.5 - linuxkit/ca-certificates:v0.5
- linuxkit/memlogd:v0.5 - linuxkit/memlogd:ba4fcf55c35a3833546a1e39125bf0fa940327b0
services: services:
- name: kmsg - name: kmsg
image: linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0 image: linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0