Skip to content

Commit cf76107

Browse files
authored
Fixed for ST_COMPONENT_MODE with a proxy (#450)
* Fixed for ST_COMPONENT_MODE with a proxy * fixed misalignment
1 parent e3c0841 commit cf76107

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

source/config/Config.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -277,13 +277,12 @@ bool PlainConfig::LoadFromCliArgs(const CliArgs &cliArgs)
277277
thingName = cliArgs.at(PlainConfig::CLI_THING_NAME).c_str();
278278
}
279279

280-
bool loadFeatureCliArgs = tunneling.LoadFromCliArgs(cliArgs) && logConfig.LoadFromCliArgs(cliArgs);
280+
bool loadFeatureCliArgs = tunneling.LoadFromCliArgs(cliArgs) && logConfig.LoadFromCliArgs(cliArgs) && httpProxyConfig.LoadFromCliArgs(cliArgs);
281281
#if !defined(DISABLE_MQTT)
282282
loadFeatureCliArgs = loadFeatureCliArgs && jobs.LoadFromCliArgs(cliArgs) &&
283283
deviceDefender.LoadFromCliArgs(cliArgs) && fleetProvisioning.LoadFromCliArgs(cliArgs) &&
284284
pubSub.LoadFromCliArgs(cliArgs) && sampleShadow.LoadFromCliArgs(cliArgs) &&
285-
configShadow.LoadFromCliArgs(cliArgs) && secureElement.LoadFromCliArgs(cliArgs) &&
286-
httpProxyConfig.LoadFromCliArgs(cliArgs);
285+
configShadow.LoadFromCliArgs(cliArgs) && secureElement.LoadFromCliArgs(cliArgs);
287286
#endif
288287
return loadFeatureCliArgs;
289288
}
@@ -2686,7 +2685,6 @@ bool Config::init(const CliArgs &cliArgs)
26862685
}
26872686
#endif
26882687

2689-
#if !defined(DISABLE_MQTT)
26902688
// ST_COMPONENT_MODE does not require any settings besides those for Secure Tunneling
26912689
if (ParseConfigFile(config.httpProxyConfig.proxyConfigPath->c_str(), HTTP_PROXY_CONFIG) &&
26922690
config.httpProxyConfig.httpProxyEnabled)
@@ -2706,7 +2704,6 @@ bool Config::init(const CliArgs &cliArgs)
27062704
config.httpProxyConfig.proxyConfigPath->c_str());
27072705
return true;
27082706
}
2709-
#endif
27102707

27112708
return config.Validate();
27122709
}
@@ -3162,4 +3159,4 @@ string Config::ExpandDefaultConfigDir(bool removeTrailingSeparator)
31623159
return Util::TrimRightCopy(expandedConfigDir, string{Config::PATH_DIRECTORY_SEPARATOR});
31633160
}
31643161
return expandedConfigDir;
3165-
}
3162+
}

0 commit comments

Comments
 (0)