Merge pull request #14584 from Luap99/lint-systemd

golangci-lint: add systemd build tag
containers · Jun 15, 2022 · cab9779 · cab9779
2 parents e084f0e + 1b62e45
commit cab9779
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/hack/golangci-lint.sh b/hack/golangci-lint.sh
@@ -4,10 +4,9 @@
 set -e
 
 declare -A BUILD_TAGS
-# TODO: add systemd tag
 BUILD_TAGS[default]="apparmor,seccomp,selinux,linter"
-BUILD_TAGS[abi]="${BUILD_TAGS[default]},!remoteclient"
-BUILD_TAGS[tunnel]="${BUILD_TAGS[default]},remote,remoteclient"
+BUILD_TAGS[abi]="${BUILD_TAGS[default]},systemd"
+BUILD_TAGS[tunnel]="${BUILD_TAGS[default]},remote"
 
 declare -A SKIP_DIRS
 SKIP_DIRS[abi]="pkg/machine/e2e"

diff --git 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
@@ -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