Remove Logging to Journald only under systemd

cmd/titus-darion/main.go

@@ -15,7 +15,7 @@ func pingHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func main() {
-	logsutil.MaybeSetupLoggerIfUnderSystemd()
+	logsutil.MaybeSetupLoggerIfOnJournaldAvailable()
 	log.Println("Darion is starting")
 	r := newMux()
 	if err := http.ListenAndServe(":8004", r); err != nil {

cmd/titus-reaper/main.go

@@ -18,9 +18,10 @@ func main() {
 	flag.BoolVar(&debug, "debug", false, "Turn on debug logging")
 	flag.Parse()
 
-	logsutil.MaybeSetupLoggerIfUnderSystemd()
 	if debug {
 		log.SetLevel(log.DebugLevel)
+	} else {
+		logsutil.MaybeSetupLoggerIfOnJournaldAvailable()
 	}
 	path := os.Getenv("PATH")
 	if err := os.Setenv("PATH", fmt.Sprintf("%s%s", path, ":/usr/sbin:/sbin:/usr/local/sbin")); err != nil {

go.mod

@@ -14,7 +14,6 @@ require (
 	github.com/apparentlymart/go-cidr v0.0.0-20170616213631-2bd8b58cf427
 	github.com/aws/aws-sdk-go v1.19.15
 	github.com/coreos/go-systemd v0.0.0-20170731111925-d21964639418
-	github.com/coreos/pkg v0.0.0-20170405072653-099530d80109 // indirect
 	github.com/cyphar/filepath-securejoin v0.0.0-20190205144030-7efe413b52e1
 	github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea
 	github.com/docker/distribution v0.0.0-20170303212246-08b06dc02367 // indirect

go.sum

@@ -23,8 +23,6 @@ github.com/aws/aws-sdk-go v1.19.15/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/go-systemd v0.0.0-20170731111925-d21964639418 h1:0QH6fTJVDpblGjjozilaO++YRbnQNnTYh3yuFJHH0o8=
 github.com/coreos/go-systemd v0.0.0-20170731111925-d21964639418/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/pkg v0.0.0-20170405072653-099530d80109 h1:8RxHvQFXd1AgM3q7iG92w06tQKiuqpHCNf5lVKs9bbs=
-github.com/coreos/pkg v0.0.0-20170405072653-099530d80109/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cyphar/filepath-securejoin v0.0.0-20190205144030-7efe413b52e1 h1:pZmkaGb99St6jJZFIl/d0Q2l2n5/q6VAWcVWEht2RMk=
 github.com/cyphar/filepath-securejoin v0.0.0-20190205144030-7efe413b52e1/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

logsutil/util_linux.go

@@ -3,21 +3,9 @@
 package logsutil
 
 import (
-	"github.com/coreos/go-systemd/util"
-	log "github.com/sirupsen/logrus"
 	"github.com/wercker/journalhook"
 )
 
-// MaybeSetupLoggerIfUnderSystemd sets up journald logging if running as a systemd unit
-func MaybeSetupLoggerIfUnderSystemd() {
-	if runningFromSystemService, err := util.RunningFromSystemService(); runningFromSystemService {
-		journalhook.Enable()
-	} else if err != nil {
-		log.Error("Error checking if running under systemd unit: ", err)
-	}
-
-}
-
 // MaybeSetupLoggerIfOnJournaldAvailable sets up journald logging if the system
 func MaybeSetupLoggerIfOnJournaldAvailable() {
 	journalhook.Enable()

logsutil/util_unsupported.go

@@ -2,11 +2,6 @@
 
 package logsutil
 
-// MaybeSetupLoggerIfUnderSystemd sets up journald logging if running as a systemd unit
-func MaybeSetupLoggerIfUnderSystemd() {
-
-}
-
 // MaybeSetupLoggerIfOnJournaldAvailable sets up journald logging if the system
 func MaybeSetupLoggerIfOnJournaldAvailable() {
 }