Commit 1b5d2e98 authored by Dominik Charousset's avatar Dominik Charousset

Integrate review feedback

parent a02aa8d4
...@@ -94,7 +94,7 @@ public: ...@@ -94,7 +94,7 @@ public:
/// configuration file. /// configuration file.
error parse(string_list args, std::istream& config); error parse(string_list args, std::istream& config);
/// Parses `args` as CLI options and tries locate a config file via /// Parses `args` as CLI options and tries to locate a config file via
/// `config_file_path` and `config_file_path_alternative` unless the user /// `config_file_path` and `config_file_path_alternative` unless the user
/// provides a config file path on the command line. /// provides a config file path on the command line.
error parse(string_list args); error parse(string_list args);
...@@ -105,9 +105,9 @@ public: ...@@ -105,9 +105,9 @@ public:
/// Parses the CLI options `{argc, argv}` and `config` as configuration file. /// Parses the CLI options `{argc, argv}` and `config` as configuration file.
error parse(int argc, char** argv, std::istream& config); error parse(int argc, char** argv, std::istream& config);
/// Parses the CLI options `{argc, argv}` and tries to open `config_file_cstr` /// Parses the CLI options `{argc, argv}` and tries to locate a config file
/// as config file. The parsers tries to open `caf-application.conf` if /// via `config_file_path` and `config_file_path_alternative` unless the user
/// `config_file_cstr` is `nullptr`. /// provides a config file path on the command line.
error parse(int argc, char** argv); error parse(int argc, char** argv);
[[deprecated("set the config_file_path member instead")]] error [[deprecated("set the config_file_path member instead")]] error
...@@ -241,7 +241,7 @@ public: ...@@ -241,7 +241,7 @@ public:
// -- parsing parameters ----------------------------------------------------- // -- parsing parameters -----------------------------------------------------
/// Configures a path for the default configuration file. /// Configures the default path of the configuration file.
std::string config_file_path; std::string config_file_path;
/// Configures alternative paths for locating a config file when unable to /// Configures alternative paths for locating a config file when unable to
......
...@@ -350,7 +350,7 @@ error actor_system_config::parse(string_list args, std::istream& config) { ...@@ -350,7 +350,7 @@ error actor_system_config::parse(string_list args, std::istream& config) {
error actor_system_config::parse(string_list args) { error actor_system_config::parse(string_list args) {
if (auto&& [err, path] = extract_config_file_path(args); !err) { if (auto&& [err, path] = extract_config_file_path(args); !err) {
std::ifstream conf; std::ifstream conf;
// No error but an empty path means --config-file=ARG was missing. // No error. An empty path simply means no --config-file=ARG was passed.
if (!path.empty()) { if (!path.empty()) {
conf.open(path); conf.open(path);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment