rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-30 06:43:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3757

Browse Source 
6f9260e handle optional miner params better (cryptochangements34)
This commit is contained in:
luigi1111 2018-06-20 14:09:42 -05:00
commit 36aeaa7545
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cryptonote_basic/miner.cpp
View File

@ -328,6 +328,11 @@ namespace cryptonote
LOG_PRINT_L0("Background mining controller thread started" ); LOG_PRINT_L0("Background mining controller thread started" );
} }
if(get_ignore_battery())
{
MINFO("Ignoring battery");
}
return true; return true;
} }
//----------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------

19
src/daemon/command_parser_executor.cpp
View File

@ -27,6 +27,7 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "common/dns_utils.h" #include "common/dns_utils.h"
#include "common/command_line.h"
#include "version.h" #include "version.h"
#include "daemon/command_parser_executor.h" #include "daemon/command_parser_executor.h"
@ -326,12 +327,26 @@ bool t_command_parser_executor::start_mining(const std::vector<std::string>& arg
if(args.size() == 4) if(args.size() == 4)
{ {
ignore_battery = args[3] == "true"; if(args[3] == "true" || command_line::is_yes(args[3]) || args[3] == "1")
{
ignore_battery = true;
}
else if(args[3] != "false" && !command_line::is_no(args[3]) && args[3] != "0")
{
return false;
}
} }
if(args.size() >= 3) if(args.size() >= 3)
{ {
do_background_mining = args[2] == "true"; if(args[2] == "true" || command_line::is_yes(args[2]) || args[2] == "1")
{
do_background_mining = true;
}
else if(args[2] != "false" && !command_line::is_no(args[2]) && args[2] != "0")
{
return false;
}
} }
if(args.size() >= 2) if(args.size() >= 2)