fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only update pool and algo when its not donating

Browse source
This commit is contained in:
Ben Gräf 2019-10-26 15:50:28 +02:00
parent f674dd47d4
commit 3cfb65dead
2 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

64
README.md
View file

@ -72,35 +72,48 @@ Check the [Coin Configuration](https://github.com/Bendr0id/xmrigCC/wiki/Coin-con
## Usage ## Usage
### Basic example XMRigCCServer ### Basic example XMRigCCServer
``` ```
xmrigCCServer --cc-port=3344 --cc-user=admin --cc-pass=pass --cc-access-token=SECRET_TOKEN_TO_ACCESS_CC_SERVER xmrigServer --port=3344 --user=admin --pass=pass --access-token=SECRET_TOKEN_TO_ACCESS_CC_SERVER
``` ```
### Options XMRigCCServer ### Options XMRigCCServer
``` ```
--cc-user=USERNAME CC Server admin user -b, --bind arg The CC Server bind ip (default: 0.0.0.0)
--cc-pass=PASSWORD CC Server admin pass -p, --port N The CC Server port
--cc-access-token=T CC Server access token for CC Client -U, --user arg The CC Server admin user
--cc-port=N CC Server port -P, --pass arg The CC Server admin pass
--cc-use-tls enable tls encryption for CC communication -T, --token arg The CC Server access token for the CC Client
--cc-cert-file=FILE when tls is turned on, use this to point to the right cert file (default: server.pem) -t, --tls Enable SSL/TLS support
--cc-key-file=FILE when tls is turned on, use this to point to the right key file (default: server.key) -K, --key-file FILE The private key file to use when TLS is ON
--cc-client-log-lines-history=N maximum lines of log history kept per miner (default: 100) (default: server.key)
--cc-client-config-folder=FOLDER Folder contains the client config files -C, --cert-file FILE The cert file to use when TLS is ON (default:
--cc-pushover-user-key your user key for pushover notifications server.pem)
--cc-pushover-api-token api token/keytoken of the application for pushover notifications -B, --background Run the Server in the background
--cc-telegram-bot-token your bot token for telegram notifications -S, --syslog Log to the syslog
--cc-telegram-chat-id your chat-id for telegram notifications --no-colors Disable colored output
--cc-push-miner-offline-info push notification for offline miners and recover push --pushover-user-key arg The user key for pushover notifications
--cc-push-miner-zero-hash-info push notification when miner reports 0 hashrate and recover push --pushover-api-token arg The api token/keytoken of the application for
--cc-push-periodic-mining-status push periodic status notification (every hour) pushover notification
--cc-custom-dashboard=FILE loads a custom dashboard and serve it to '/' --telegram-bot-token arg The bot token for telegram notifications
--no-color disable colored output --telegram-chat-id arg The chat-id for telegram notifications
-S, --syslog use system log for output messages --push-miner-offline-info
-B, --background run the miner in the background Push notification for offline miners and
-c, --config=FILE load a JSON-format configuration file recovery (default: true)
-l, --log-file=FILE log all output to a file --push-miner-zero-hash-info
-h, --help display this help and exit Push notification when miner reports 0
-V, --version output version information and exit hashrate and recovers (default: true)
--push-periodic-mining-status
Push every hour a status notification
(default: true)
--custom-dashboard FILE The custom dashboard to use (default:
index.html)
--client-config-folder FOLDER
The CC Server access token for the CC Client
--log-file FILE The log file to write
--client-log-lines-history N
Maximum lines of log history kept per miner
(default: 100)
-c, --config FILE The JSON-format configuration file to use
-h, --help Print this help
``` ```
@ -120,6 +133,7 @@ xmrigDaemon -o pool.minemonero.pro:5555 -u YOUR_WALLET -p x -k --cc-url=IP_OF_CC
cn-extremelite cn-extremelite
argon2/chukwa, argon2/wrkz argon2/chukwa, argon2/wrkz
rx/wow, rx/loki rx/wow, rx/loki
--coin=COIN specify coin instead of algorithm
-o, --url=URL URL of mining server -o, --url=URL URL of mining server
-O, --userpass=U:P username:password pair for mining server -O, --userpass=U:P username:password pair for mining server
-u, --user=USERNAME username for mining server -u, --user=USERNAME username for mining server

7
src/net/Network.cpp
View file

@ -247,9 +247,10 @@ void xmrig::Network::onUpdateRequest(ClientStatus& clientStatus)
clientStatus.setHashesTotal(m_state.total); clientStatus.setHashesTotal(m_state.total);
clientStatus.setAvgTime(m_state.avgTime()); clientStatus.setAvgTime(m_state.avgTime());
clientStatus.setCurrentPool(m_state.pool); if (!m_donate || !m_donate->isActive()) {
clientStatus.setCurrentPool(m_state.pool);
clientStatus.setCurrentAlgoName(m_strategy->client()->job().algorithm().name()); clientStatus.setCurrentAlgoName(m_strategy->client()->job().algorithm().name());
}
} }
#endif #endif