composer: cleanup unused code related to fluentd sidecar

COMPOSER-2051

cmd/osbuild-composer/config.go

@@ -11,16 +11,15 @@ import (
 )
 
 type ComposerConfigFile struct {
-	Koji         KojiAPIConfig   `toml:"koji"`
+	Koji        KojiAPIConfig   `toml:"koji"`
-	Worker       WorkerAPIConfig `toml:"worker"`
+	Worker      WorkerAPIConfig `toml:"worker"`
-	WeldrAPI     WeldrAPIConfig  `toml:"weldr_api"`
+	WeldrAPI    WeldrAPIConfig  `toml:"weldr_api"`
-	SyslogServer string          `toml:"syslog_server" env:"SYSLOG_SERVER"`
+	LogLevel    string          `toml:"log_level"`
-	LogLevel     string          `toml:"log_level"`
+	LogFormat   string          `toml:"log_format"`
-	LogFormat    string          `toml:"log_format"`
+	DNFJson     string          `toml:"dnf-json"`
-	DNFJson      string          `toml:"dnf-json"`
+	SplunkHost  string          `env:"SPLUNK_HEC_HOST"`
-	SplunkHost   string          `env:"SPLUNK_HEC_HOST"`
+	SplunkPort  string          `env:"SPLUNK_HEC_PORT"`
-	SplunkPort   string          `env:"SPLUNK_HEC_PORT"`
+	SplunkToken string          `env:"SPLUNK_HEC_TOKEN"`
-	SplunkToken  string          `env:"SPLUNK_HEC_TOKEN"`
 }
 
 type KojiAPIConfig struct {

cmd/osbuild-composer/main.go

@@ -8,7 +8,6 @@ import (
 	"github.com/coreos/go-systemd/activation"
 	slogger "github.com/osbuild/osbuild-composer/pkg/splunk_logger"
 	"github.com/sirupsen/logrus"
-	"github.com/sirupsen/logrus/hooks/syslog"
 )
 
 const (
@@ -81,15 +80,6 @@ func main() {
 		logrus.Fatal("CACHE_DIRECTORY is not set. Is the service file missing CacheDirectory=?")
 	}
 
-	if len(config.SyslogServer) > 0 {
-		hook, err := syslog.NewSyslogHook("tcp", config.SyslogServer, 0, "osbuild-composer")
-		if err != nil {
-			logrus.Fatal("Error connecting to syslog: " + err.Error())
-		}
-
-		logrus.AddHook(hook)
-	}
-
 	composer, err := NewComposer(config, stateDir, cacheDir)
 	if err != nil {
 		logrus.Fatalf("%v", err)

vendor/github.com/sirupsen/logrus/hooks/syslog/README.md

@@ -1,81 +0,0 @@
-# Syslog Hooks for Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:"/>
-
-## Usage
-
-```go
-import (
-  "log/syslog"
-  "github.com/sirupsen/logrus"
-  lSyslog "github.com/sirupsen/logrus/hooks/syslog"
-)
-
-func main() {
-  log       := logrus.New()
-  hook, err := lSyslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-
-  if err == nil {
-    log.Hooks.Add(hook)
-  }
-}
-```
-
-If you want to connect to local syslog (Ex. "/dev/log" or "/var/run/syslog" or "/var/run/log"). Just assign empty string to the first two parameters of `NewSyslogHook`. It should look like the following.
-
-```go
-import (
-  "log/syslog"
-  "github.com/sirupsen/logrus"
-  lSyslog "github.com/sirupsen/logrus/hooks/syslog"
-)
-
-func main() {
-  log       := logrus.New()
-  hook, err := lSyslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
-
-  if err == nil {
-    log.Hooks.Add(hook)
-  }
-}
-```
-
-### Different log levels for local and remote logging
-
-By default `NewSyslogHook()` sends logs through the hook for all log levels. If you want to have
-different log levels between local logging and syslog logging (i.e. respect the `priority` argument
-passed to `NewSyslogHook()`), you need to implement the `logrus_syslog.SyslogHook` interface
-overriding `Levels()` to return only the log levels you're interested on.
-
-The following example shows how to log at **DEBUG** level for local logging and **WARN** level for
-syslog logging:
-
-```go
-package main
-
-import (
-	"log/syslog"
-
-	log "github.com/sirupsen/logrus"
-	logrus_syslog "github.com/sirupsen/logrus/hooks/syslog"
-)
-
-type customHook struct {
-	*logrus_syslog.SyslogHook
-}
-
-func (h *customHook) Levels() []log.Level {
-	return []log.Level{log.WarnLevel}
-}
-
-func main() {
-	log.SetLevel(log.DebugLevel)
-
-	hook, err := logrus_syslog.NewSyslogHook("tcp", "localhost:5140", syslog.LOG_WARNING, "myTag")
-	if err != nil {
-		panic(err)
-	}
-
-	log.AddHook(&customHook{hook})
-
-	//...
-}
-```

vendor/github.com/sirupsen/logrus/hooks/syslog/syslog.go

@@ -1,55 +0,0 @@
-// +build !windows,!nacl,!plan9
-
-package syslog
-
-import (
-	"fmt"
-	"log/syslog"
-	"os"
-
-	"github.com/sirupsen/logrus"
-)
-
-// SyslogHook to send logs via syslog.
-type SyslogHook struct {
-	Writer        *syslog.Writer
-	SyslogNetwork string
-	SyslogRaddr   string
-}
-
-// Creates a hook to be added to an instance of logger. This is called with
-// `hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_DEBUG, "")`
-// `if err == nil { log.Hooks.Add(hook) }`
-func NewSyslogHook(network, raddr string, priority syslog.Priority, tag string) (*SyslogHook, error) {
-	w, err := syslog.Dial(network, raddr, priority, tag)
-	return &SyslogHook{w, network, raddr}, err
-}
-
-func (hook *SyslogHook) Fire(entry *logrus.Entry) error {
-	line, err := entry.String()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to read entry, %v", err)
-		return err
-	}
-
-	switch entry.Level {
-	case logrus.PanicLevel:
-		return hook.Writer.Crit(line)
-	case logrus.FatalLevel:
-		return hook.Writer.Crit(line)
-	case logrus.ErrorLevel:
-		return hook.Writer.Err(line)
-	case logrus.WarnLevel:
-		return hook.Writer.Warning(line)
-	case logrus.InfoLevel:
-		return hook.Writer.Info(line)
-	case logrus.DebugLevel, logrus.TraceLevel:
-		return hook.Writer.Debug(line)
-	default:
-		return nil
-	}
-}
-
-func (hook *SyslogHook) Levels() []logrus.Level {
-	return logrus.AllLevels
-}

vendor/modules.txt

@@ -750,7 +750,6 @@ github.com/sigstore/sigstore/pkg/signature/payload
 # github.com/sirupsen/logrus v1.9.3
 ## explicit; go 1.13
 github.com/sirupsen/logrus
-github.com/sirupsen/logrus/hooks/syslog
 # github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b
 ## explicit; go 1.12
 github.com/sony/gobreaker