kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

agent: Ensure logger set up method is public. (#24886)

Browse Source 
This is needed by a Nomad Enterprise code path.
This commit is contained in:
James Rasell
2025-01-17 14:47:06 +01:00
committed by GitHub
parent 1df94b1470
commit 63ea13be77
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
command/agent/command.go
View File

@@ -549,8 +549,11 @@ func (c *Command) IsValidConfig(config, cmdConfig *Config) bool {
return true
}
// setupLoggers is used to set up the logGate and our logOutput.
func setupLoggers(ui cli.Ui, config *Config) (*gatedwriter.Writer, io.Writer) {
// SetupLoggers is used to set up the logGate and our logOutput.
//
// The function needs to be public due to the way it is used within the Nomad
// Enterprise codebase.
func SetupLoggers(ui cli.Ui, config *Config) (*gatedwriter.Writer, io.Writer) {
// Pull the log level from the configuration, ensure it is titled and then
// perform validation. Do this before the gated writer, as this can
@@ -801,7 +804,7 @@ func (c *Command) Run(args []string) int {
}
// Set up the log outputs.
logGate, logOutput := setupLoggers(c.Ui, config)
logGate, logOutput := SetupLoggers(c.Ui, config)
if logGate == nil {
return 1
}

4
command/agent/command_test.go
View File

@@ -639,7 +639,7 @@ func Test_setupLoggers_logFile(t *testing.T) {
}
// Generate the loggers and ensure the correct error is generated.
gatedWriter, writer := setupLoggers(mockUI, cfg)
gatedWriter, writer := SetupLoggers(mockUI, cfg)
must.Nil(t, gatedWriter)
must.Nil(t, writer)
must.StrContains(t, mockUI.ErrorWriter.String(), "Invalid log level: WARNING")
@@ -650,7 +650,7 @@ func Test_setupLoggers_logFile(t *testing.T) {
// Update the log level, so that it is a valid option and set up the
// loggers again.
cfg.LogLevel = "warn"
gatedWriter, writer = setupLoggers(mockUI, cfg)
gatedWriter, writer = SetupLoggers(mockUI, cfg)
must.NotNil(t, gatedWriter)
must.NotNil(t, writer)