Fix exit codes:
- `--help`, `--version` etc should exit with `0` i.e. no error ("not enough args" case should still trigger an error) - error reading config file should exit with `1` Slightly refactor AppInitRPC/AppInitRawTx to return standard exit codes (EXIT_FAILURE/EXIT_SUCCESS) or CONTINUE_EXECUTION (-1)
This commit is contained in:
parent
a4fd8dff68
commit
bd0de1386e
4 changed files with 37 additions and 17 deletions
|
@ -28,6 +28,7 @@ using namespace std;
|
||||||
|
|
||||||
static const char DEFAULT_RPCCONNECT[] = "127.0.0.1";
|
static const char DEFAULT_RPCCONNECT[] = "127.0.0.1";
|
||||||
static const int DEFAULT_HTTP_CLIENT_TIMEOUT=900;
|
static const int DEFAULT_HTTP_CLIENT_TIMEOUT=900;
|
||||||
|
static const int CONTINUE_EXECUTION=-1;
|
||||||
|
|
||||||
std::string HelpMessageCli()
|
std::string HelpMessageCli()
|
||||||
{
|
{
|
||||||
|
@ -67,7 +68,11 @@ public:
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static bool AppInitRPC(int argc, char* argv[])
|
//
|
||||||
|
// This function returns either one of EXIT_ codes when it's expected to stop the process or
|
||||||
|
// CONTINUE_EXECUTION when it's expected to continue further.
|
||||||
|
//
|
||||||
|
static int AppInitRPC(int argc, char* argv[])
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Parameters
|
// Parameters
|
||||||
|
@ -85,31 +90,35 @@ static bool AppInitRPC(int argc, char* argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(stdout, "%s", strUsage.c_str());
|
fprintf(stdout, "%s", strUsage.c_str());
|
||||||
return false;
|
if (argc < 2) {
|
||||||
|
fprintf(stderr, "Error: too few parameters\n");
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
if (!boost::filesystem::is_directory(GetDataDir(false))) {
|
if (!boost::filesystem::is_directory(GetDataDir(false))) {
|
||||||
fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", mapArgs["-datadir"].c_str());
|
fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", mapArgs["-datadir"].c_str());
|
||||||
return false;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs);
|
ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs);
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
fprintf(stderr,"Error reading configuration file: %s\n", e.what());
|
fprintf(stderr,"Error reading configuration file: %s\n", e.what());
|
||||||
return false;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
// Check for -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)
|
// Check for -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)
|
||||||
try {
|
try {
|
||||||
SelectBaseParams(ChainNameFromCommandLine());
|
SelectBaseParams(ChainNameFromCommandLine());
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
fprintf(stderr, "Error: %s\n", e.what());
|
fprintf(stderr, "Error: %s\n", e.what());
|
||||||
return false;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
if (GetBoolArg("-rpcssl", false))
|
if (GetBoolArg("-rpcssl", false))
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Error: SSL mode for RPC (-rpcssl) is no longer supported.\n");
|
fprintf(stderr, "Error: SSL mode for RPC (-rpcssl) is no longer supported.\n");
|
||||||
return false;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
return true;
|
return CONTINUE_EXECUTION;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -354,8 +363,9 @@ int main(int argc, char* argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if(!AppInitRPC(argc, argv))
|
int ret = AppInitRPC(argc, argv);
|
||||||
return EXIT_FAILURE;
|
if (ret != CONTINUE_EXECUTION)
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
catch (const std::exception& e) {
|
catch (const std::exception& e) {
|
||||||
PrintExceptionContinue(&e, "AppInitRPC()");
|
PrintExceptionContinue(&e, "AppInitRPC()");
|
||||||
|
|
|
@ -30,8 +30,13 @@ using namespace std;
|
||||||
|
|
||||||
static bool fCreateBlank;
|
static bool fCreateBlank;
|
||||||
static map<string,UniValue> registers;
|
static map<string,UniValue> registers;
|
||||||
|
static const int CONTINUE_EXECUTION=-1;
|
||||||
|
|
||||||
static bool AppInitRawTx(int argc, char* argv[])
|
//
|
||||||
|
// This function returns either one of EXIT_ codes when it's expected to stop the process or
|
||||||
|
// CONTINUE_EXECUTION when it's expected to continue further.
|
||||||
|
//
|
||||||
|
static int AppInitRawTx(int argc, char* argv[])
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Parameters
|
// Parameters
|
||||||
|
@ -89,9 +94,13 @@ static bool AppInitRawTx(int argc, char* argv[])
|
||||||
strUsage += HelpMessageOpt("set=NAME:JSON-STRING", _("Set register NAME to given JSON-STRING"));
|
strUsage += HelpMessageOpt("set=NAME:JSON-STRING", _("Set register NAME to given JSON-STRING"));
|
||||||
fprintf(stdout, "%s", strUsage.c_str());
|
fprintf(stdout, "%s", strUsage.c_str());
|
||||||
|
|
||||||
return false;
|
if (argc < 2) {
|
||||||
|
fprintf(stderr, "Error: too few parameters\n");
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
return true;
|
return CONTINUE_EXECUTION;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void RegisterSetJson(const string& key, const string& rawJson)
|
static void RegisterSetJson(const string& key, const string& rawJson)
|
||||||
|
@ -678,8 +687,9 @@ int main(int argc, char* argv[])
|
||||||
SetupEnvironment();
|
SetupEnvironment();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if(!AppInitRawTx(argc, argv))
|
int ret = AppInitRawTx(argc, argv);
|
||||||
return EXIT_FAILURE;
|
if (ret != CONTINUE_EXECUTION)
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
catch (const std::exception& e) {
|
catch (const std::exception& e) {
|
||||||
PrintExceptionContinue(&e, "AppInitRawTx()");
|
PrintExceptionContinue(&e, "AppInitRawTx()");
|
||||||
|
|
|
@ -92,7 +92,7 @@ bool AppInit(int argc, char* argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(stdout, "%s", strUsage.c_str());
|
fprintf(stdout, "%s", strUsage.c_str());
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
|
|
|
@ -573,7 +573,7 @@ int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
HelpMessageDialog help(NULL, mapArgs.count("-version"));
|
HelpMessageDialog help(NULL, mapArgs.count("-version"));
|
||||||
help.showOrPrint();
|
help.showOrPrint();
|
||||||
return 1;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 5. Now that settings and translations are available, ask user for data directory
|
/// 5. Now that settings and translations are available, ask user for data directory
|
||||||
|
@ -594,7 +594,7 @@ int main(int argc, char *argv[])
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
|
QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
|
||||||
QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what()));
|
QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what()));
|
||||||
return false;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 7. Determine network (and switch to network specific options)
|
/// 7. Determine network (and switch to network specific options)
|
||||||
|
|
Loading…
Reference in a new issue