agent: Make agent syslog log level inherit from Nomad agent log (#15625)
This commit is contained in:
parent
c40dea83a4
commit
ca2f509e82
|
@ -0,0 +1,3 @@
|
|||
```release-note:bug
|
||||
agent: Make agent syslog log level follow log_level config
|
||||
```
|
|
@ -472,10 +472,21 @@ func SetupLoggers(ui cli.Ui, config *Config) (*logutils.LevelFilter, *gatedwrite
|
|||
|
||||
// Create a log writer, and wrap a logOutput around it
|
||||
writers := []io.Writer{logFilter}
|
||||
|
||||
logLevel := strings.ToUpper(config.LogLevel)
|
||||
logLevelMap := map[string]gsyslog.Priority{
|
||||
"ERROR": gsyslog.LOG_ERR,
|
||||
"WARN": gsyslog.LOG_WARNING,
|
||||
"INFO": gsyslog.LOG_INFO,
|
||||
"DEBUG": gsyslog.LOG_DEBUG,
|
||||
"TRACE": gsyslog.LOG_DEBUG,
|
||||
}
|
||||
if logLevel == "OFF" {
|
||||
config.EnableSyslog = false
|
||||
}
|
||||
// Check if syslog is enabled
|
||||
if config.EnableSyslog {
|
||||
l, err := gsyslog.NewLogger(gsyslog.LOG_NOTICE, config.SyslogFacility, "nomad")
|
||||
ui.Output(fmt.Sprintf("Config enable_syslog is `true` with log_level=%v", config.LogLevel))
|
||||
l, err := gsyslog.NewLogger(logLevelMap[logLevel], config.SyslogFacility, "nomad")
|
||||
if err != nil {
|
||||
ui.Error(fmt.Sprintf("Syslog setup failed: %v", err))
|
||||
return nil, nil, nil
|
||||
|
|
|
@ -165,7 +165,8 @@ testing.
|
|||
diagnostic information about Nomad's internals.
|
||||
|
||||
- `enable_syslog` `(bool: false)` - Specifies if the agent should log to syslog.
|
||||
This option only works on Unix based systems.
|
||||
This option only works on Unix based systems. The log level inherits from
|
||||
the Nomad agent log set in `log_level`
|
||||
|
||||
- `http_api_response_headers` `(map<string|string>: nil)` - Specifies
|
||||
user-defined headers to add to the HTTP API responses.
|
||||
|
|
Loading…
Reference in New Issue