From acbef4424aa8241b18160abc461aa8c8e3157a56 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Fri, 22 Jul 2022 15:02:19 +0200 Subject: [PATCH] Make the linter happy Signed-off-by: David Gageot --- pkg/memlogd/cmd/logread/main.go | 6 +++--- pkg/memlogd/cmd/memlogd/main.go | 28 ++++++++++++++-------------- pkg/memlogd/cmd/memlogd/main_test.go | 12 ++++++------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkg/memlogd/cmd/logread/main.go b/pkg/memlogd/cmd/logread/main.go index 39ffea99c..ff1d2ee90 100644 --- a/pkg/memlogd/cmd/logread/main.go +++ b/pkg/memlogd/cmd/logread/main.go @@ -15,13 +15,13 @@ const ( logDumpFollow ) -type LogEntry struct { +type logEntry struct { Time time.Time `json:"time"` Source string `json:"source"` Msg string `json:"msg"` } -func (msg *LogEntry) String() string { +func (msg *logEntry) String() string { return fmt.Sprintf("%s;%s;%s", msg.Time.Format(time.RFC3339Nano), strings.ReplaceAll(msg.Source, `;`, `\;`), msg.Msg) } @@ -61,7 +61,7 @@ func main() { panic(err) } - var entry LogEntry + var entry logEntry decoder := json.NewDecoder(conn) for { if err := decoder.Decode(&entry); err != nil { diff --git a/pkg/memlogd/cmd/memlogd/main.go b/pkg/memlogd/cmd/memlogd/main.go index 1c343f9d0..7f8dbeea7 100644 --- a/pkg/memlogd/cmd/memlogd/main.go +++ b/pkg/memlogd/cmd/memlogd/main.go @@ -17,13 +17,13 @@ import ( "time" ) -type LogEntry struct { +type logEntry struct { Time time.Time `json:"time"` Source string `json:"source"` Msg string `json:"msg"` } -func (msg *LogEntry) String() string { +func (msg *logEntry) String() string { return fmt.Sprintf("%s;%s;%s", msg.Time.Format(time.RFC3339Nano), strings.ReplaceAll(msg.Source, `;`, `\;`), msg.Msg) } @@ -47,13 +47,13 @@ type queryMessage struct { type connListener struct { conn net.Conn - output chan *LogEntry + output chan *logEntry err error exitOnEOF bool // exit instead of blocking if no more data in read buffer } -func doLog(logCh chan LogEntry, msg string) { - logCh <- LogEntry{ +func doLog(logCh chan logEntry, msg string) { + logCh <- logEntry{ Time: time.Now(), Source: "memlogd", Msg: msg, @@ -72,7 +72,7 @@ func logQueryHandler(l *connListener) { } } -func ringBufferHandler(ringSize, chanSize int, logCh chan LogEntry, queryMsgChan chan queryMessage) { +func ringBufferHandler(ringSize, chanSize int, logCh chan logEntry, queryMsgChan chan queryMessage) { // Anything that interacts with the ring buffer goes through this handler ring := ring.New(ringSize) listeners := list.New() @@ -112,7 +112,7 @@ func ringBufferHandler(ringSize, chanSize int, logCh chan LogEntry, queryMsgChan case msg := <-queryMsgChan: l := connListener{ conn: msg.conn, - output: make(chan *LogEntry, chanSize), + output: make(chan *logEntry, chanSize), err: nil, exitOnEOF: (msg.mode == logDump), } @@ -124,7 +124,7 @@ func ringBufferHandler(ringSize, chanSize int, logCh chan LogEntry, queryMsgChan if msg.mode == logDumpFollow || msg.mode == logDump { // fill with current data in buffer ring.Do(func(f interface{}) { - if msg, ok := f.(LogEntry); ok { + if msg, ok := f.(logEntry); ok { select { case l.output <- &msg: default: @@ -140,7 +140,7 @@ func ringBufferHandler(ringSize, chanSize int, logCh chan LogEntry, queryMsgChan } } -func receiveQueryHandler(l *net.UnixListener, logCh chan LogEntry, queryMsgChan chan queryMessage) { +func receiveQueryHandler(l *net.UnixListener, logCh chan logEntry, queryMsgChan chan queryMessage) { for { var conn *net.UnixConn var err error @@ -157,7 +157,7 @@ func receiveQueryHandler(l *net.UnixListener, logCh chan LogEntry, queryMsgChan } } -func receiveFdHandler(conn *net.UnixConn, logCh chan LogEntry, fdMsgChan chan fdMessage) { +func receiveFdHandler(conn *net.UnixConn, logCh chan logEntry, fdMsgChan chan fdMessage) { oob := make([]byte, 512) b := make([]byte, 512) @@ -195,7 +195,7 @@ func receiveFdHandler(conn *net.UnixConn, logCh chan LogEntry, fdMsgChan chan fd } } -func readLogFromFd(maxLineLen int, fd int, source string, logCh chan LogEntry) { +func readLogFromFd(maxLineLen int, fd int, source string, logCh chan logEntry) { f := os.NewFile(uintptr(fd), "") defer f.Close() @@ -217,7 +217,7 @@ func readLogFromFd(maxLineLen int, fd int, source string, logCh chan LogEntry) { if buffer.Len() > maxLineLen { buffer.Truncate(maxLineLen) } - logCh <- LogEntry{ + logCh <- logEntry{ Time: time.Now(), Source: source, Msg: buffer.String(), @@ -228,7 +228,7 @@ func readLogFromFd(maxLineLen int, fd int, source string, logCh chan LogEntry) { } } -func loggingRequestHandler(lineMaxLength int, logCh chan LogEntry, fdMsgChan chan fdMessage) { +func loggingRequestHandler(lineMaxLength int, logCh chan logEntry, fdMsgChan chan fdMessage) { for msg := range fdMsgChan { go readLogFromFd(lineMaxLength, msg.fd, msg.name, logCh) } @@ -314,7 +314,7 @@ func main() { os.Exit(0) } - logCh := make(chan LogEntry) + logCh := make(chan logEntry) fdMsgChan := make(chan fdMessage) queryMsgChan := make(chan queryMessage) diff --git a/pkg/memlogd/cmd/memlogd/main_test.go b/pkg/memlogd/cmd/memlogd/main_test.go index 229520bec..4f48554ef 100644 --- a/pkg/memlogd/cmd/memlogd/main_test.go +++ b/pkg/memlogd/cmd/memlogd/main_test.go @@ -15,7 +15,7 @@ func TestNonblock(t *testing.T) { // Test that writes to the logger don't block because it is full linesInBuffer := 10 - logCh := make(chan LogEntry) + logCh := make(chan logEntry) queryMsgChan := make(chan queryMessage) go ringBufferHandler(linesInBuffer, linesInBuffer, logCh, queryMsgChan) @@ -23,7 +23,7 @@ func TestNonblock(t *testing.T) { // Overflow the log to make sure it doesn't block for i := 0; i < 2*linesInBuffer; i++ { select { - case logCh <- LogEntry{Time: time.Now(), Source: "memlogd", Msg: "hello TestNonblock"}: + case logCh <- logEntry{Time: time.Now(), Source: "memlogd", Msg: "hello TestNonblock"}: continue case <-time.After(time.Second): t.Errorf("write to the logger blocked for over 1s after %d (size was set to %d)", i, linesInBuffer) @@ -35,14 +35,14 @@ func TestFinite(t *testing.T) { // Test that the logger doesn't store more than its configured maximum size linesInBuffer := 10 - logCh := make(chan LogEntry) + logCh := make(chan logEntry) queryMsgChan := make(chan queryMessage) go ringBufferHandler(linesInBuffer, linesInBuffer, logCh, queryMsgChan) // Overflow the log by 2x for i := 0; i < 2*linesInBuffer; i++ { - logCh <- LogEntry{Time: time.Now(), Source: "memlogd", Msg: "hello TestFinite"} + logCh <- logEntry{Time: time.Now(), Source: "memlogd", Msg: "hello TestFinite"} } a, b := loopback() defer a.Close() @@ -75,14 +75,14 @@ func TestFinite2(t *testing.T) { linesInBuffer := 10 // the output buffer size will be 1/2 of the ring outputBufferSize := linesInBuffer / 2 - logCh := make(chan LogEntry) + logCh := make(chan logEntry) queryMsgChan := make(chan queryMessage) go ringBufferHandler(linesInBuffer, outputBufferSize, logCh, queryMsgChan) // fill the ring for i := 0; i < linesInBuffer; i++ { - logCh <- LogEntry{Time: time.Now(), Source: "memlogd", Msg: "hello TestFinite2"} + logCh <- logEntry{Time: time.Now(), Source: "memlogd", Msg: "hello TestFinite2"} } a, b := loopback()