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

Merge pull request #3737 from ebriney/memlogd-time-nano

Browse Source 
Use RFC3339Nano for timestamps
This commit is contained in:
David Scott 2021-11-28 10:29:17 +00:00 committed by GitHub
commit 33a4330cf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 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:21dbbda709ae138de0af6b0c7e4ae49525db5e88
- linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e
- linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4
- linuxkit/memlogd:55ba089dd98e96b0aeb24463852fb7539e2c2c1e
- linuxkit/memlogd:fe4a123b619a7dfffc2ba1297dd03b4ac90e3dd7
onboot:
- name: sysctl
image: linuxkit/sysctl:0dc8f792fc3a58afcebcb0fbe6b48de587265c17

2
pkg/memlogd/cmd/memlogd/main.go
View File

@ -66,7 +66,7 @@ func logQueryHandler(l *connListener) {
}
func (msg *logEntry) String() string {
return fmt.Sprintf("%s,%s;%s", msg.time.Format(time.RFC3339), msg.source, msg.msg)
return fmt.Sprintf("%s,%s;%s", msg.time.Format(time.RFC3339Nano), msg.source, msg.msg)
}
func ringBufferHandler(ringSize, chanSize int, logCh chan logEntry, queryMsgChan chan queryMessage) {

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

@ -6,7 +6,7 @@ init:
- linuxkit/runc:21dbbda709ae138de0af6b0c7e4ae49525db5e88
- linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e
- linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4
- linuxkit/memlogd:55ba089dd98e96b0aeb24463852fb7539e2c2c1e
- linuxkit/memlogd:fe4a123b619a7dfffc2ba1297dd03b4ac90e3dd7
services:
- name: kmsg
image: linuxkit/kmsg:2ed5334395ec64a7844a2cbd88837050fbd34880

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

@ -6,7 +6,7 @@ init:
- linuxkit/runc:21dbbda709ae138de0af6b0c7e4ae49525db5e88
- linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e
- linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4
- linuxkit/memlogd:55ba089dd98e96b0aeb24463852fb7539e2c2c1e
- linuxkit/memlogd:fe4a123b619a7dfffc2ba1297dd03b4ac90e3dd7
services:
# A service which generates logs of log messages
- name: fill-the-logs