mirror of
https://github.com/SChernykh/p2pool.git
synced 2024-12-22 11:29:23 +00:00
Renamed --config
command line parameter
This commit is contained in:
parent
a4459d6207
commit
dd7e2a477f
6 changed files with 13 additions and 5 deletions
|
@ -11,7 +11,8 @@
|
||||||
--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 Name of p2pool sidechain's config file (don't use it unless you want to mine to a different p2pool chain)
|
--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)
|
||||||
--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
|
||||||
--stratum-api An alias for --local-api
|
--stratum-api An alias for --local-api
|
||||||
|
|
|
@ -49,7 +49,8 @@ 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 Name of the p2pool config file\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"
|
||||||
"--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"
|
||||||
"--stratum-api An alias for --local-api\n"
|
"--stratum-api An alias for --local-api\n"
|
||||||
|
|
|
@ -102,7 +102,13 @@ Params::Params(int argc, char* const argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((strcmp(argv[i], "--config") == 0) && (i + 1 < argc)) {
|
if ((strcmp(argv[i], "--config") == 0) && (i + 1 < argc)) {
|
||||||
m_config = argv[++i];
|
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)) {
|
||||||
|
m_sidechainConfig = argv[++i];
|
||||||
ok = true;
|
ok = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ struct Params
|
||||||
std::string m_stratumAddresses;
|
std::string m_stratumAddresses;
|
||||||
std::string m_p2pAddresses;
|
std::string m_p2pAddresses;
|
||||||
std::string m_p2pPeerList;
|
std::string m_p2pPeerList;
|
||||||
std::string m_config;
|
std::string m_sidechainConfig;
|
||||||
std::string m_apiPath;
|
std::string m_apiPath;
|
||||||
bool m_localStats = false;
|
bool m_localStats = false;
|
||||||
bool m_blockCache = true;
|
bool m_blockCache = true;
|
||||||
|
|
|
@ -84,7 +84,7 @@ SideChain::SideChain(p2pool* pool, NetworkType type, const char* pool_name)
|
||||||
|
|
||||||
LOGINFO(1, log::LightCyan() << "network type = " << type);
|
LOGINFO(1, log::LightCyan() << "network type = " << type);
|
||||||
|
|
||||||
if (m_pool && !load_config(m_pool->params().m_config)) {
|
if (m_pool && !load_config(m_pool->params().m_sidechainConfig)) {
|
||||||
PANIC_STOP();
|
PANIC_STOP();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue