mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add logging of parsed command line options

Browse Source 
The recognized command line options are now being printed when Scylla is run,
together with the whole command used.
Fixes #4203.
This commit is contained in:
Kamil Braun
2019-07-01 16:55:38 +02:00
parent f155a2d334
commit 2f0f53ac72
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
main.cc
View File

@@ -384,6 +384,34 @@ static std::optional<std::vector<sstring>> parse_hinted_handoff_enabled(sstring
return dcs;
}
// Formats parsed program options into a string as follows:
// "[key1: value1_1 value1_2 ..., key2: value2_1 value 2_2 ..., (positional) value3, ...]"
std::string format_parsed_options(const std::vector<bpo::option>& opts) {
return fmt::format("[{}]",
boost::algorithm::join(opts | boost::adaptors::transformed([] (const bpo::option& opt) {
if (opt.value.empty()) {
return opt.string_key;
}
return (opt.string_key.empty() ? "(positional) " : fmt::format("{}: ", opt.string_key)) +
boost::algorithm::join(opt.value, " ");
}), ", ")
);
}
void print_starting_message(int ac, char** av, const bpo::parsed_options& opts) {
fmt::print("Scylla version {} starting ...\n", scylla_version());
if (ac) {
fmt::print("command used: \"{}", av[0]);
for (int i = 1; i < ac; ++i) {
fmt::print(" {}", av[i]);
}
fmt::print("\"\n");
}
fmt::print("parsed command line options: {}\n", format_parsed_options(opts.options));
}
int main(int ac, char** av) {
int return_value = 0;
try {
@@ -420,12 +448,15 @@ int main(int ac, char** av) {
// If --version is requested, print it out and exit immediately to avoid
// Seastar-specific warnings that may occur when running the app
bpo::variables_map vm;
bpo::store(bpo::command_line_parser(ac, av).options(app.get_options_description()).allow_unregistered().run(), vm);
auto parsed_opts = bpo::command_line_parser(ac, av).options(app.get_options_description()).allow_unregistered().run();
bpo::store(parsed_opts, vm);
if (vm["version"].as<bool>()) {
fmt::print("{}\n", scylla_version());
return 0;
}
print_starting_message(ac, av, parsed_opts);
distributed<database> db;
seastar::sharded<service::cache_hitrate_calculator> cf_cache_hitrate_calculator;
debug::db = &db;
@@ -440,7 +471,6 @@ int main(int ac, char** av) {
return app.run(ac, av, [&] () -> future<int> {
fmt::print("Scylla version {} starting ...\n", scylla_version());
auto&& opts = app.configuration();
namespace sm = seastar::metrics;