Removed deprected --config parameter
This commit is contained in:
@@ -11,7 +11,6 @@
|
|||||||
--light-mode Don't allocate RandomX dataset, saves 2GB of RAM
|
--light-mode Don't allocate RandomX dataset, saves 2GB of RAM
|
||||||
--loglevel Verbosity of the log, integer number between 0 and 6
|
--loglevel Verbosity of the log, integer number between 0 and 6
|
||||||
--data-dir Path to store general p2pool files (log, cache, peer data, etc.), default is current directory
|
--data-dir Path to store general p2pool files (log, cache, peer data, etc.), default is current directory
|
||||||
--config Deprecated, will be removed in the next version. Use --sidechain-config instead
|
|
||||||
--sidechain-config Name of the p2pool sidechain parameters file (only use it if you run your own sidechain)
|
--sidechain-config Name of the p2pool sidechain parameters file (only use it if you run your own sidechain)
|
||||||
--data-api Path to the p2pool JSON data (use it in tandem with an external web-server). Not affected by --data-dir setting!
|
--data-api Path to the p2pool JSON data (use it in tandem with an external web-server). Not affected by --data-dir setting!
|
||||||
--local-api Enable /local/ path in api path for Stratum Server and built-in miner statistics
|
--local-api Enable /local/ path in api path for Stratum Server and built-in miner statistics
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ void p2pool_usage()
|
|||||||
"--light-mode Don't allocate RandomX dataset, saves 2GB of RAM\n"
|
"--light-mode Don't allocate RandomX dataset, saves 2GB of RAM\n"
|
||||||
"--loglevel Verbosity of the log, integer number between 0 and %d\n"
|
"--loglevel Verbosity of the log, integer number between 0 and %d\n"
|
||||||
"--data-dir Path to store general p2pool files (log, cache, peer data, etc.), default is current directory\n"
|
"--data-dir Path to store general p2pool files (log, cache, peer data, etc.), default is current directory\n"
|
||||||
"--config Deprecated, will be removed in the next version. Use --sidechain-config instead\n"
|
|
||||||
"--sidechain-config Name of the p2pool sidechain parameters file (only use it if you run your own sidechain)\n"
|
"--sidechain-config Name of the p2pool sidechain parameters file (only use it if you run your own sidechain)\n"
|
||||||
"--data-api Path to the p2pool JSON data (use it in tandem with an external web-server). Not affected by --data-dir setting!\n"
|
"--data-api Path to the p2pool JSON data (use it in tandem with an external web-server). Not affected by --data-dir setting!\n"
|
||||||
"--local-api Enable /local/ path in api path for Stratum Server and built-in miner statistics\n"
|
"--local-api Enable /local/ path in api path for Stratum Server and built-in miner statistics\n"
|
||||||
|
|||||||
+3
-6
@@ -101,12 +101,6 @@ Params::Params(int argc, char* const argv[])
|
|||||||
ok = true;
|
ok = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((strcmp(argv[i], "--config") == 0) && (i + 1 < argc)) {
|
|
||||||
LOGWARN(0, "--config command line parameter is deprecated and will be removed in the next version. Use --sidechain-config instead");
|
|
||||||
m_sidechainConfig = argv[++i];
|
|
||||||
ok = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((strcmp(argv[i], "--sidechain-config") == 0) && (i + 1 < argc)) {
|
if ((strcmp(argv[i], "--sidechain-config") == 0) && (i + 1 < argc)) {
|
||||||
m_sidechainConfig = argv[++i];
|
m_sidechainConfig = argv[++i];
|
||||||
ok = true;
|
ok = true;
|
||||||
@@ -245,6 +239,9 @@ Params::Params(int argc, char* const argv[])
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
|
// Wait to avoid log messages overlapping with printf() calls and making a mess on screen
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(10));
|
||||||
|
|
||||||
fprintf(stderr, "Unknown command line parameter %s\n\n", argv[i]);
|
fprintf(stderr, "Unknown command line parameter %s\n\n", argv[i]);
|
||||||
p2pool_usage();
|
p2pool_usage();
|
||||||
throw std::exception();
|
throw std::exception();
|
||||||
|
|||||||
Reference in New Issue
Block a user