Make executable names configurable #7118
Conversation
| @@ -48,7 +48,7 @@ int main(int argc, char** argv) | |||
| if(!app().initialize<wallet_plugin, wallet_api_plugin, http_plugin>(argc, argv)) | |||
| return -1; | |||
| auto& http = app().get_plugin<http_plugin>(); | |||
| http.add_handler("/v1/keosd/stop", [](string, string, url_response_callback cb) { cb(200, fc::variant(fc::variant_object())); std::raise(SIGTERM); } ); | |||
| http.add_handler("/v1/" + keosd::config::key_store_executable_name + "/stop", [](string, string, url_response_callback cb) { cb(200, fc::variant(fc::variant_object())); std::raise(SIGTERM); } ); | |||
There was a problem hiding this comment.
need to change the corresponding line in httpc.hpp too
programs/eosio-launcher/main.cpp
Outdated
| @@ -1557,7 +1558,7 @@ launcher_def::launch (eosd_def &instance, string >s) { | |||
| install_path = specific_nodeos_installation_paths[node_num] + "/"; | |||
| } | |||
| } | |||
| string eosdcmd = install_path + "programs/nodeos/nodeos "; | |||
| string eosdcmd = install_path + "programs/nodeos/" + string(node_executable_name); | |||
There was a problem hiding this comment.
you lost a trailing space here, and it might be why tests are failing
There was a problem hiding this comment.
Thank you, I applied it.
| ("skip-signature", bpo::bool_switch(&skip_transaction_signatures)->default_value(false), (string(node_executable_name) + " does not require transaction signatures.").c_str()) | ||
| (node_executable_name, bpo::value<string>(&eosd_extra_args), ("forward " + string(node_executable_name) + " command line argument(s) to each instance of " + string(node_executable_name) + ", enclose arg(s) in quotes").c_str()) | ||
| ("specific-num", bpo::value<vector<uint>>()->composing(), ("forward " + string(node_executable_name) + " command line argument(s) (using \"--specific-" + string(node_executable_name) + "\" flag) to this specific instance of " + string(node_executable_name) + ". This parameter can be entered multiple times and requires a paired \"--specific-" + string(node_executable_name) +"\" flag each time it is used").c_str()) | ||
| (("specific-" + string(node_executable_name)).c_str(), bpo::value<vector<string>>()->composing(), ("forward " + string(node_executable_name) + " command line argument(s) to its paired specific instance of " + string(node_executable_name) + "(using \"--specific-num\"), enclose arg(s) in quotes").c_str()) |
There was a problem hiding this comment.
unfortunately changing these config names will mean that the python test scripts will not operate when node_executable_name is not 'nodeos'
maybe these two config items should be renamed to something else that doesn't include "nodeos"? (to avoid having to preprocess all the various python scripts with whatever is configured)
There was a problem hiding this comment.
I found the scripts you mentioned, and I guess there can be another cases which contain hard-coded these options. I don't like this way much, but what about adding new option like -node-exec, but also leaving -nodeos for backward compatibility?
There was a problem hiding this comment.
come to think of it, those scripts won't work before your change anyways because of hardcoded "nodeos", "keosd", etc in the scripts too. Would be nice to take care of that in the future, but I think PR is ready as-is
Change Description
CMakeLists.txthas options for changing the name of executables like nodeos, keosd or cleos, but there are hard-coded strings in their source code. This PR makes executable names configurable by setting path to changed name or applying new name in help text.Consensus Changes
API Changes
Documentation Additions