GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-25 14:04:25 +00:00
Code Issues Releases Wiki Activity

core: undo some of previous two commits and andd conditionals to display user name as <incognito> instead.

Browse Source 
Fix whitspace (squashed).
This commit is contained in:
Noel Maersk 2014-02-28 02:42:38 +02:00
parent 2561295e3d
commit d78f372712
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
sgminer.c
View File

@ -755,12 +755,8 @@ static char *set_poolname(char *arg)
add_pool(); add_pool();
pool = pools[json_array_index]; pool = pools[json_array_index];
if (opt_incognito) { applog(LOG_DEBUG, "Setting pool %i name to %s", pool->pool_no, arg);
applog(LOG_DEBUG, "Incognito mode requested, not setting pool %i name", pool->pool_no); opt_set_charp(arg, &pool->poolname);
} else {
applog(LOG_DEBUG, "Setting pool %i name to %s", pool->pool_no, arg);
opt_set_charp(arg, &pool->poolname);
}
return NULL; return NULL;
} }
@ -2175,20 +2171,19 @@ static void curses_print_status(void)
local_work, total_go, total_ro); local_work, total_go, total_ro);
wclrtoeol(statuswin); wclrtoeol(statuswin);
if (!opt_incognito) { if (shared_strategy() && total_pools > 1) {
if (shared_strategy() && total_pools > 1) { cg_mvwprintw(statuswin, ++line, 0, "Connected to multiple pools %s block change notify",
cg_mvwprintw(statuswin, ++line, 0, "Connected to multiple pools %s block change notify", have_longpoll ? "with": "without");
have_longpoll ? "with": "without"); } else {
} else { cg_mvwprintw(statuswin, ++line, 0, "Connected to %s (%s) diff %s as user %s",
cg_mvwprintw(statuswin, ++line, 0, "Connected to %s (%s) diff %s as user %s", pool->poolname,
pool->poolname, pool->has_stratum ? "stratum" : (pool->has_gbt ? "GBT" : "longpoll"),
pool->has_stratum ? "stratum" : (pool->has_gbt ? "GBT" : "longpoll"), pool->diff,
pool->diff, pool->rpc_user); opt_incognito ? "<incognito>" : pool->rpc_user);
}
wclrtoeol(statuswin);
} }
wclrtoeol(statuswin);
cg_mvwprintw(statuswin, ++line, 0, "Block: %s... Diff:%s Started: %s Best share: %s ", cg_mvwprintw(statuswin, ++line, 0, "Block: %s... Diff:%s Started: %s Best share: %s ",
prev_block, block_diff, blocktime, best_share); prev_block, block_diff, blocktime, best_share);
@ -4539,11 +4534,12 @@ updated:
{ {
disp_name = pool->rpc_url; disp_name = pool->rpc_url;
} }
wlogprint("%s Quota %d Prio %d: '%s' User:%s\n", wlogprint("%s Quota %d Prio %d '%s' User:%s\n",
pool->idle ? "Dead" : "Alive", pool->idle ? "Dead" : "Alive",
pool->quota, pool->quota,
pool->prio, pool->prio,
disp_name, pool->rpc_user); disp_name,
opt_incognito ? "<incognito>" : pool->rpc_user);
wattroff(logwin, A_BOLD | A_DIM); wattroff(logwin, A_BOLD | A_DIM);
} }
retry: retry:
@ -7845,6 +7841,10 @@ int main(int argc, char *argv[])
strcat(sgminer_path, "\\"); strcat(sgminer_path, "\\");
#endif #endif
devcursor = 8;
logstart = devcursor + 1;
logcursor = logstart + 1;
block = (struct block *)calloc(sizeof(struct block), 1); block = (struct block *)calloc(sizeof(struct block), 1);
if (unlikely(!block)) if (unlikely(!block))
quit (1, "main OOM"); quit (1, "main OOM");
@ -7893,16 +7893,8 @@ int main(int argc, char *argv[])
if (use_curses) if (use_curses)
enable_curses(); enable_curses();
/* Print device stats from this line. */
devcursor = opt_incognito ? 7 : 8;
#else
devcursor = 8;
#endif #endif
logstart = devcursor + 1;
logcursor = logstart + 1;
applog(LOG_WARNING, "Started %s", packagename); applog(LOG_WARNING, "Started %s", packagename);
if (cnfbuf) { if (cnfbuf) {
applog(LOG_NOTICE, "Loaded configuration file %s", cnfbuf); applog(LOG_NOTICE, "Loaded configuration file %s", cnfbuf);