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 { | ||||
| 			cfg.Root = v | ||||
| 			cfg.LogLevel = v | ||||
| 		} | ||||
| 	} | ||||
| 	return nil | ||||
|  | ||||
| @ -87,32 +87,42 @@ func TestUpdateFromReader(t *testing.T) { | ||||
| 				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 { | ||||
| 		cfg := getDefaultConfig() | ||||
| 	for _, tc := range testCases { | ||||
| 		t.Run(tc.description, func(t *testing.T) { | ||||
| 			cfg := getDefaultConfig() | ||||
| 
 | ||||
| 		c := tomlConfig{ | ||||
| 			logger: logger, | ||||
| 			sections: []tomlSection{ | ||||
| 				{section: nvidiaContainerRuntimeConfigSection}, | ||||
| 			}, | ||||
| 		} | ||||
| 		var reader io.Reader | ||||
| 		if tc.readerError { | ||||
| 			reader = iotest.ErrReader(fmt.Errorf("error")) | ||||
| 		} else { | ||||
| 			reader = strings.NewReader(strings.Join(tc.lines, "\n")) | ||||
| 		} | ||||
| 			c := tomlConfig{ | ||||
| 				logger: logger, | ||||
| 				sections: []tomlSection{ | ||||
| 					{section: nvidiaContainerRuntimeConfigSection}, | ||||
| 				}, | ||||
| 			} | ||||
| 			var reader io.Reader | ||||
| 			if tc.readerError { | ||||
| 				reader = iotest.ErrReader(fmt.Errorf("error")) | ||||
| 			} else { | ||||
| 				reader = strings.NewReader(strings.Join(tc.lines, "\n")) | ||||
| 			} | ||||
| 
 | ||||
| 		err := c.updateFromReader(cfg, reader) | ||||
| 			err := c.updateFromReader(cfg, reader) | ||||
| 
 | ||||
| 		if tc.expectedError { | ||||
| 			require.Error(t, err, "%d: %v", i, tc.description) | ||||
| 		} else { | ||||
| 			require.NoError(t, err, "%d: %v", i, tc.description) | ||||
| 		} | ||||
| 		require.EqualValues(t, tc.expected, cfg, "%d: %v", i, tc.description) | ||||
| 			if tc.expectedError { | ||||
| 				require.Error(t, err) | ||||
| 			} else { | ||||
| 				require.NoError(t, err) | ||||
| 			} | ||||
| 			require.EqualValues(t, tc.expected, cfg) | ||||
| 		}) | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user