From 7f40160f6e06168e3f61aba96992a1a7c31db8d9 Mon Sep 17 00:00:00 2001 From: "Thibault \"bui\" Koechlin" Date: Thu, 11 Feb 2021 18:28:01 +0100 Subject: [PATCH] only set logfile dir if media is file (#615) --- pkg/apiserver/apiserver.go | 2 +- pkg/csconfig/api.go | 1 + pkg/csconfig/config.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index de452c2e6..2f7d1e7c4 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -52,7 +52,7 @@ func NewServer(config *csconfig.LocalApiServerCfg) (*APIServer, error) { } logFile := "" - if config.LogDir != "" { + if config.LogDir != "" && config.LogMedia == "file" { logFile = fmt.Sprintf("%s/crowdsec_api.log", config.LogDir) } diff --git a/pkg/csconfig/api.go b/pkg/csconfig/api.go index 126e3526c..7d4dfe100 100644 --- a/pkg/csconfig/api.go +++ b/pkg/csconfig/api.go @@ -32,6 +32,7 @@ type LocalApiServerCfg struct { TLS *TLSCfg `yaml:"tls"` DbConfig *DatabaseCfg `yaml:"-"` LogDir string `yaml:"-"` + LogMedia string `yaml:"-"` OnlineClient *OnlineApiClientCfg `yaml:"online_client"` ProfilesPath string `yaml:"profiles_path,omitempty"` Profiles []*ProfileCfg `yaml:"-"` diff --git a/pkg/csconfig/config.go b/pkg/csconfig/config.go index f12f8e7f2..b6fd09e65 100644 --- a/pkg/csconfig/config.go +++ b/pkg/csconfig/config.go @@ -139,6 +139,7 @@ func (c *GlobalConfig) LoadConfiguration() error { if c.API.Server != nil && !c.DisableAPI { c.API.Server.DbConfig = c.DbConfig c.API.Server.LogDir = c.Common.LogDir + c.API.Server.LogMedia = c.Common.LogMedia if err := c.API.Server.LoadProfiles(); err != nil { return errors.Wrap(err, "while loading profiles for LAPI") }