diff --git a/cmd/osbuild-composer/config.go b/cmd/osbuild-composer/config.go index 2318dfb73..a36a1f667 100644 --- a/cmd/osbuild-composer/config.go +++ b/cmd/osbuild-composer/config.go @@ -11,16 +11,15 @@ import ( ) type ComposerConfigFile struct { - Koji KojiAPIConfig `toml:"koji"` - Worker WorkerAPIConfig `toml:"worker"` - WeldrAPI WeldrAPIConfig `toml:"weldr_api"` - SyslogServer string `toml:"syslog_server" env:"SYSLOG_SERVER"` - LogLevel string `toml:"log_level"` - LogFormat string `toml:"log_format"` - DNFJson string `toml:"dnf-json"` - SplunkHost string `env:"SPLUNK_HEC_HOST"` - SplunkPort string `env:"SPLUNK_HEC_PORT"` - SplunkToken string `env:"SPLUNK_HEC_TOKEN"` + Koji KojiAPIConfig `toml:"koji"` + Worker WorkerAPIConfig `toml:"worker"` + WeldrAPI WeldrAPIConfig `toml:"weldr_api"` + LogLevel string `toml:"log_level"` + LogFormat string `toml:"log_format"` + DNFJson string `toml:"dnf-json"` + SplunkHost string `env:"SPLUNK_HEC_HOST"` + SplunkPort string `env:"SPLUNK_HEC_PORT"` + SplunkToken string `env:"SPLUNK_HEC_TOKEN"` } type KojiAPIConfig struct { diff --git a/cmd/osbuild-composer/main.go b/cmd/osbuild-composer/main.go index bc2379135..101b0a172 100644 --- a/cmd/osbuild-composer/main.go +++ b/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) diff --git a/vendor/github.com/sirupsen/logrus/hooks/syslog/README.md b/vendor/github.com/sirupsen/logrus/hooks/syslog/README.md deleted file mode 100644 index 67cb5ea85..000000000 --- a/vendor/github.com/sirupsen/logrus/hooks/syslog/README.md +++ /dev/null @@ -1,81 +0,0 @@ -# Syslog Hooks for Logrus :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}) - - //... -} -``` diff --git a/vendor/github.com/sirupsen/logrus/hooks/syslog/syslog.go b/vendor/github.com/sirupsen/logrus/hooks/syslog/syslog.go deleted file mode 100644 index 02b8df380..000000000 --- a/vendor/github.com/sirupsen/logrus/hooks/syslog/syslog.go +++ /dev/null @@ -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 -} diff --git a/vendor/modules.txt b/vendor/modules.txt index db0d250b4..5e685b976 100644 --- a/vendor/modules.txt +++ b/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