Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

return zero exit status for nodeos version, help, fixed reversible, and extracted genesis #7484

Merged
merged 2 commits into from
Jun 20, 2019
Merged

return zero exit status for nodeos version, help, fixed reversible, and extracted genesis #7484

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5e087a
return zero exit status for nodeos version, help, fixed reversible, a…
Jun 11, 2019
f860cbe
Update appbase commit reference
Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/appbase
Open in desktop
Submodule appbase updated 2 files
+6 −1 application.cpp
+2 −0 include/appbase/application.hpp
10 changes: 7 additions & 3 deletions programs/nodeos/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ enum return_codes {
SUCCESS = 0,
BAD_ALLOC = 1,
DATABASE_DIRTY = 2,
FIXED_REVERSIBLE = 3,
EXTRACTED_GENESIS = 4,
FIXED_REVERSIBLE = SUCCESS,
EXTRACTED_GENESIS = SUCCESS,
NODE_MANAGEMENT_SUCCESS = 5
};

Expand All @@ -93,8 +93,12 @@ int main(int argc, char** argv)
.default_unix_socket_path = "",
.default_http_port = 8888
});
if(!app().initialize<chain_plugin, net_plugin, producer_plugin>(argc, argv))
if(!app().initialize<chain_plugin, net_plugin, producer_plugin>(argc, argv)) {
if(app().get_options().count("help") || app().get_options().count("version")) {
return SUCCESS;
}
return INITIALIZE_FAIL;
}
initialize_logging();
ilog("${name} version ${ver}", ("name", nodeos::config::node_executable_name)("ver", app().version_string()));
ilog("${name} using configuration file ${c}", ("name", nodeos::config::node_executable_name)("c", app().full_config_file_path().string()));
Expand Down