summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2022-06-13 13:36:20 +0200
committerPaul Holzinger <pholzing@redhat.com>2022-06-14 15:28:45 +0200
commit1b62e4543845907ffba61086a79883751abca819 (patch)
tree72059e447976aa1fcc7935193cf405c174e34d82 /libpod
parent9fac1b335f681400a029e9d8014f45fa5634ec40 (diff)
downloadpodman-1b62e4543845907ffba61086a79883751abca819.tar.gz
podman-1b62e4543845907ffba61086a79883751abca819.tar.bz2
podman-1b62e4543845907ffba61086a79883751abca819.zip
golangci-lint: add systemd build tag
Lint the systemd code and fix the reported problems. The remoteclient tag is no longer used so I just removed it. [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_log_linux.go7
-rw-r--r--libpod/events/journal_linux.go3
2 files changed, 5 insertions, 5 deletions
diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go
index deb726526..7f90332c7 100644
--- a/libpod/container_log_linux.go
+++ b/libpod/container_log_linux.go
@@ -292,11 +292,12 @@ func formatterPrefix(entry *sdjournal.JournalEntry) (string, error) {
if !ok {
return "", errors.Errorf("no PRIORITY field present in journal entry")
}
- if priority == journaldLogOut {
+ switch priority {
+ case journaldLogOut:
output += "stdout "
- } else if priority == journaldLogErr {
+ case journaldLogErr:
output += "stderr "
- } else {
+ default:
return "", errors.Errorf("unexpected PRIORITY field in journal entry")
}
diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go
index 866042a4c..4db87c14d 100644
--- a/libpod/events/journal_linux.go
+++ b/libpod/events/journal_linux.go
@@ -64,7 +64,7 @@ func (e EventJournalD) Write(ee Event) error {
case Volume:
m["PODMAN_NAME"] = ee.Name
}
- return journal.Send(string(ee.ToHumanReadable(false)), journal.PriInfo, m)
+ return journal.Send(ee.ToHumanReadable(false), journal.PriInfo, m)
}
// Read reads events from the journal and sends qualified events to the event channel
@@ -167,7 +167,6 @@ func (e EventJournalD) Read(ctx context.Context, options ReadOptions) error {
}
}
return nil
-
}
func newEventFromJournalEntry(entry *sdjournal.JournalEntry) (*Event, error) { //nolint