composer: cleanup unused code related to fluentd sidecar

COMPOSER-2051
This commit is contained in:
Diaa Sami 2023-11-28 16:39:38 +01:00 committed by Sanne Raymaekers
parent 3c3445c832
commit 2443048ecf
5 changed files with 9 additions and 157 deletions

View file

@ -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 {

View file

@ -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)