@@ -277,13 +277,12 @@ bool PlainConfig::LoadFromCliArgs(const CliArgs &cliArgs)
277
277
thingName = cliArgs.at (PlainConfig::CLI_THING_NAME).c_str ();
278
278
}
279
279
280
- bool loadFeatureCliArgs = tunneling.LoadFromCliArgs (cliArgs) && logConfig.LoadFromCliArgs (cliArgs);
280
+ bool loadFeatureCliArgs = tunneling.LoadFromCliArgs (cliArgs) && logConfig.LoadFromCliArgs (cliArgs) && httpProxyConfig. LoadFromCliArgs (cliArgs) ;
281
281
#if !defined(DISABLE_MQTT)
282
282
loadFeatureCliArgs = loadFeatureCliArgs && jobs.LoadFromCliArgs (cliArgs) &&
283
283
deviceDefender.LoadFromCliArgs (cliArgs) && fleetProvisioning.LoadFromCliArgs (cliArgs) &&
284
284
pubSub.LoadFromCliArgs (cliArgs) && sampleShadow.LoadFromCliArgs (cliArgs) &&
285
- configShadow.LoadFromCliArgs (cliArgs) && secureElement.LoadFromCliArgs (cliArgs) &&
286
- httpProxyConfig.LoadFromCliArgs (cliArgs);
285
+ configShadow.LoadFromCliArgs (cliArgs) && secureElement.LoadFromCliArgs (cliArgs);
287
286
#endif
288
287
return loadFeatureCliArgs;
289
288
}
@@ -2686,7 +2685,6 @@ bool Config::init(const CliArgs &cliArgs)
2686
2685
}
2687
2686
#endif
2688
2687
2689
- #if !defined(DISABLE_MQTT)
2690
2688
// ST_COMPONENT_MODE does not require any settings besides those for Secure Tunneling
2691
2689
if (ParseConfigFile (config.httpProxyConfig .proxyConfigPath ->c_str (), HTTP_PROXY_CONFIG) &&
2692
2690
config.httpProxyConfig .httpProxyEnabled )
@@ -2706,7 +2704,6 @@ bool Config::init(const CliArgs &cliArgs)
2706
2704
config.httpProxyConfig .proxyConfigPath ->c_str ());
2707
2705
return true ;
2708
2706
}
2709
- #endif
2710
2707
2711
2708
return config.Validate ();
2712
2709
}
@@ -3162,4 +3159,4 @@ string Config::ExpandDefaultConfigDir(bool removeTrailingSeparator)
3162
3159
return Util::TrimRightCopy (expandedConfigDir, string{Config::PATH_DIRECTORY_SEPARATOR});
3163
3160
}
3164
3161
return expandedConfigDir;
3165
- }
3162
+ }
0 commit comments