Skip to content

Commit 48b2f48

Browse files
committed
Refactor client configuration loading logic
1 parent 5f5491f commit 48b2f48

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

httpclient/httpclient_client_configuration.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,12 @@ func SetClientConfiguration(configFilePath string) (*ClientConfig, error) {
3434
// Load config values from environment variables
3535
loadConfigFromEnv(config)
3636

37-
// Check if the configuration is complete; if not, load from file
38-
if !validateConfigCompletion(config) {
39-
if configFilePath != "" {
40-
if err := config.loadConfigFromFile(configFilePath); err != nil {
41-
return nil, err
42-
}
43-
} else {
44-
return nil, fmt.Errorf("http client configuration is incomplete. Required environment variables are missing, and no configuration file path is provided. Please set the necessary environment variables or provide a valid configuration file path")
37+
// Load config values from file if necessary
38+
if validateConfigCompletion(config) && configFilePath != "" {
39+
log.Printf("Configuration values are incomplete from environment variables, attempting to load from config file: %s", configFilePath)
40+
if err := config.loadConfigFromFile(configFilePath); err != nil {
41+
log.Printf("Failed to load configuration from file: %s, error: %v", configFilePath, err)
42+
return nil, err
4543
}
4644
}
4745

0 commit comments

Comments
 (0)