mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2025-06-26 18:18:24 +00:00
Correctly set log-level from config.toml
This change contains a bugfix where the log-level (if specified in the config.toml file) would be assigned to config.Root instead of config.LogLevel. Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
parent
cf192169a8
commit
ffd98424d8
@ -117,7 +117,7 @@ func (c tomlConfig) updateFromReader(cfg *Config, reader io.Reader) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if v, ok := section.GetStringFrom(toml, "log-level"); ok {
|
if v, ok := section.GetStringFrom(toml, "log-level"); ok {
|
||||||
cfg.Root = v
|
cfg.LogLevel = v
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
@ -87,32 +87,42 @@ func TestUpdateFromReader(t *testing.T) {
|
|||||||
LogLevel: "info",
|
LogLevel: "info",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
description: "log-level is set",
|
||||||
|
lines: []string{"nvidia-container-runtime.log-level=\"trace\""},
|
||||||
|
expected: &Config{
|
||||||
|
DebugFilePath: "/dev/null",
|
||||||
|
LogLevel: "trace",
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, tc := range testCases {
|
for _, tc := range testCases {
|
||||||
cfg := getDefaultConfig()
|
t.Run(tc.description, func(t *testing.T) {
|
||||||
|
cfg := getDefaultConfig()
|
||||||
|
|
||||||
c := tomlConfig{
|
c := tomlConfig{
|
||||||
logger: logger,
|
logger: logger,
|
||||||
sections: []tomlSection{
|
sections: []tomlSection{
|
||||||
{section: nvidiaContainerRuntimeConfigSection},
|
{section: nvidiaContainerRuntimeConfigSection},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
var reader io.Reader
|
var reader io.Reader
|
||||||
if tc.readerError {
|
if tc.readerError {
|
||||||
reader = iotest.ErrReader(fmt.Errorf("error"))
|
reader = iotest.ErrReader(fmt.Errorf("error"))
|
||||||
} else {
|
} else {
|
||||||
reader = strings.NewReader(strings.Join(tc.lines, "\n"))
|
reader = strings.NewReader(strings.Join(tc.lines, "\n"))
|
||||||
}
|
}
|
||||||
|
|
||||||
err := c.updateFromReader(cfg, reader)
|
err := c.updateFromReader(cfg, reader)
|
||||||
|
|
||||||
if tc.expectedError {
|
if tc.expectedError {
|
||||||
require.Error(t, err, "%d: %v", i, tc.description)
|
require.Error(t, err)
|
||||||
} else {
|
} else {
|
||||||
require.NoError(t, err, "%d: %v", i, tc.description)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
require.EqualValues(t, tc.expected, cfg, "%d: %v", i, tc.description)
|
require.EqualValues(t, tc.expected, cfg)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user