toml configuration file does not work #379
Comments
sctb512
changed the title
|
With the suggested fix #380 it is no longer possible to enable |
Hi @PKizzle, thanks for your comment. Actually, I also considered this solution. But I think it might not work because the Here is a test for this: result: In my opinion the |
|
If I execute the exact same test it passes for me. Yes |
Yes, I have changed back that line. But I think this has nothing to do with our test because we are assigning
This test works for me too. If I understand correctly, there are four cases we should consider. If we use the func TestSnapshotterConfig(t *testing.T) {
A := assert.New(t)
var cfg SnapshotterConfig
var args command.Args
// The log_to_stdout is false in toml file without --log-to-stdout flag.
// Expected false.
cfg.LoggingConfig.LogToStdout = false
err := ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, false)
// The log_to_stdout is true in toml file without --log-to-stdout flag.
// Expected true.
// This case is failed.
cfg.LoggingConfig.LogToStdout = true
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, true)
// The log_to_stdout is true in toml file but --log-to-stdout flag is false.
// Expected true (command flag has higher priority).
args.LogToStdout = true
cfg.LoggingConfig.LogToStdout = false
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, true)
// The log_to_stdout is false in toml file but --log-to-stdout flag is true.
// Expected false (command flag has higher priority).
args.LogToStdout = false
cfg.LoggingConfig.LogToStdout = true
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, false)
}Could you please help me check this test? Thank you. 😄 |
|
I think there was something mixed up in the test source code. I changed it to the following and it passes successfully: func TestSnapshotterConfig(t *testing.T) {
A := assert.New(t)
var cfg SnapshotterConfig
var args command.Args
// The log_to_stdout is false in toml file without --log-to-stdout flag.
// Expected false.
cfg.LoggingConfig.LogToStdout = false
err := ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, false)
// The log_to_stdout is true in toml file without --log-to-stdout flag.
// Expected true.
// This case is failed.
cfg.LoggingConfig.LogToStdout = true
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, true)
// The log_to_stdout is false in toml file with --log-to-stdout flag.
// Expected true (command flag has higher priority).
args.LogToStdout = true
cfg.LoggingConfig.LogToStdout = false
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, true)
// The log_to_stdout is true in toml file with --log-to-stdout flag.
// Expected true (command flag has higher priority).
args.LogToStdout = true
cfg.LoggingConfig.LogToStdout = true
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, true)
} |
|
Currently |
|
I fixed it by updating https://github.com/urfave/cli to flags.go type Args struct {
Address string
LogLevel string
NydusdConfigPath string
SnapshotterConfigPath string
RootDir string
NydusdPath string
NydusImagePath string
DaemonMode string
FsDriver string
LogToStdout bool
LogToStdoutCount int
PrintVersion bool
}
...
&cli.BoolFlag{
Name: "log-to-stdout",
Usage: "print log messages to STDOUT",
Destination: &args.LogToStdout,
Count: &args.LogToStdoutCount,
},config.go if args.LogToStdoutCount > 0 {
logConfig.LogToStdout = args.LogToStdout
}config_test.go func TestSnapshotterConfig(t *testing.T) {
A := assert.New(t)
var cfg SnapshotterConfig
var args command.Args
// The log_to_stdout is false in toml file without --log-to-stdout flag.
// Expected false.
cfg.LoggingConfig.LogToStdout = false
args.LogToStdoutCount = 0
err := ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, false)
// The log_to_stdout is true in toml file without --log-to-stdout flag.
// Expected true.
// This case is failed.
cfg.LoggingConfig.LogToStdout = true
args.LogToStdoutCount = 0
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, true)
// The log_to_stdout is false in toml file with --log-to-stdout=true.
// Expected true (command flag has higher priority).
args.LogToStdout = true
args.LogToStdoutCount = 1
cfg.LoggingConfig.LogToStdout = false
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, true)
// The log_to_stdout is true in toml file with --log-to-stdout=true.
// Expected true (command flag has higher priority).
args.LogToStdout = true
args.LogToStdoutCount = 1
cfg.LoggingConfig.LogToStdout = true
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, true)
// The log_to_stdout is false in toml file with --log-to-stdout=false.
// Expected false (command flag has higher priority).
args.LogToStdout = false
args.LogToStdoutCount = 1
cfg.LoggingConfig.LogToStdout = false
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, false)
// The log_to_stdout is true in toml file with --log-to-stdout=false.
// Expected false (command flag has higher priority).
args.LogToStdout = false
args.LogToStdoutCount = 1
cfg.LoggingConfig.LogToStdout = true
err = ParseParameters(&args, &cfg)
A.NoError(err)
A.EqualValues(cfg.LoggingConfig.LogToStdout, false)
} |
I think this is the perfect solution to our problem. |
|
Do you specifically want version v2.15.0 or can I go for the latest version? |
|
This is my PR with the fix: #391 |
I think |
It seems that the
tomlconfiguration file does not work. Because it is overwritten even the flags.Args is null in theParseParametersfunction.Here is a test:
diff --git a/config/config_test.go b/config/config_test.go index ad47909..d123f45 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -10,6 +10,7 @@ import ( "testing" "time" + "github.com/containerd/nydus-snapshotter/cmd/containerd-nydus-grpc/pkg/command" "github.com/stretchr/testify/assert" ) @@ -81,6 +82,13 @@ func TestLoadSnapshotterTOMLConfig(t *testing.T) { A.EqualValues(cfg, &exampleConfig) + var args = command.Args{} + args.RootDir = "/var/lib/containerd/nydus" + exampleConfig.Root = "/var/lib/containerd/nydus" + err = ParseParameters(&args, cfg) + A.NoError(err) + A.EqualValues(cfg, &exampleConfig) + err = ProcessConfigurations(cfg) A.NoError(err)The text was updated successfully, but these errors were encountered: