d0s3t3ch/wownero-puddle
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero-puddle.git synced 2024-08-15 01:03:20 +00:00
Code Issues Projects Releases Wiki Activity

tidy config reading

Browse source
This commit is contained in:
Jethro Grassie 2019-12-23 02:57:40 -05:00
parent c9346f4a3d
commit 7b6d4932c7
No known key found for this signature in database
GPG key ID: DE8ED755616565BB
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/pool.c
View file

@ -2616,8 +2616,7 @@ client_on_accept(evutil_socket_t listener, short event, void *arg)
} }
static void static void
read_config(const char *config_file, const char *log_file, bool block_notified, read_config(const char *config_file)
const char *data_dir, const char *pid_file, bool forked)
{ {
/* Start with some defaults for any missing... */ /* Start with some defaults for any missing... */
strncpy(config.rpc_host, "127.0.0.1", 10); strncpy(config.rpc_host, "127.0.0.1", 10);
@ -2630,7 +2629,6 @@ read_config(const char *config_file, const char *log_file, bool block_notified,
config.pool_port = 4242; config.pool_port = 4242;
config.log_level = 5; config.log_level = 5;
config.webui_port = 4243; config.webui_port = 4243;
config.block_notified = block_notified;
config.disable_self_select = false; config.disable_self_select = false;
strncpy(config.data_dir, "./data", 7); strncpy(config.data_dir, "./data", 7);
@ -2644,7 +2642,7 @@ read_config(const char *config_file, const char *log_file, bool block_notified,
if (!getcwd(path, MAX_PATH)) if (!getcwd(path, MAX_PATH))
{ {
log_fatal("Cannot getcwd (%s). Aborting.", errno); log_fatal("Cannot getcwd (%s). Aborting.", errno);
abort(); exit(-1);
} }
strcat(path, "/pool.conf"); strcat(path, "/pool.conf");
if (access(path, R_OK) != 0) if (access(path, R_OK) != 0)
@ -2655,7 +2653,7 @@ read_config(const char *config_file, const char *log_file, bool block_notified,
{ {
log_fatal("Cannot find a config file in ./ or ~/ " log_fatal("Cannot find a config file in ./ or ~/ "
"and no option supplied. Aborting."); "and no option supplied. Aborting.");
abort(); exit(-1);
} }
} }
} }
@ -2665,7 +2663,7 @@ read_config(const char *config_file, const char *log_file, bool block_notified,
if (!fp) if (!fp)
{ {
log_fatal("Cannot open config file. Aborting."); log_fatal("Cannot open config file. Aborting.");
abort(); exit(-1);
} }
char line[256]; char line[256];
char *key; char *key;
@ -2759,27 +2757,21 @@ read_config(const char *config_file, const char *log_file, bool block_notified,
} }
fclose(fp); fclose(fp);
if (log_file)
strncpy(config.log_file, log_file, sizeof(config.log_file));
if (data_dir)
strncpy(config.data_dir, data_dir, sizeof(config.data_dir));
if (pid_file)
strncpy(config.pid_file, pid_file, sizeof(config.pid_file));
if (forked)
config.forked = forked;
if (!config.pool_wallet[0]) if (!config.pool_wallet[0])
{ {
log_fatal("No pool wallet supplied. Aborting."); log_fatal("No pool wallet supplied. Aborting.");
abort(); exit(-1);
} }
if (!config.wallet_rpc_host[0] || config.wallet_rpc_port == 0) if (!config.wallet_rpc_host[0] || config.wallet_rpc_port == 0)
{ {
log_fatal("Both wallet-rpc-host and wallet-rpc-port need setting. " log_fatal("Both wallet-rpc-host and wallet-rpc-port need setting. "
"Aborting."); "Aborting.");
abort(); exit(-1);
} }
}
static void print_config()
{
log_info("\nCONFIG:\n rpc_host = %s\n rpc_port = %u\n " log_info("\nCONFIG:\n rpc_host = %s\n rpc_port = %u\n "
"rpc_timeout = %u\n pool_wallet = %s\n " "rpc_timeout = %u\n pool_wallet = %s\n "
"pool_start_diff = %"PRIu64"\n share_mul = %.2f\n " "pool_start_diff = %"PRIu64"\n share_mul = %.2f\n "
@ -2959,19 +2951,31 @@ int main(int argc, char **argv)
} }
setvbuf(stdout, NULL, _IONBF, 0); setvbuf(stdout, NULL, _IONBF, 0);
log_set_level(LOG_INFO); log_set_level(LOG_INFO);
log_info("Starting pool");
read_config(config_file, log_file, block_notified, data_dir,
pid_file, forked);
read_config(config_file);
if (config_file) if (config_file)
free(config_file); free(config_file);
/* Any supplied command line options take precedent... */
if (log_file) if (log_file)
{
strncpy(config.log_file, log_file, sizeof(config.log_file));
free(log_file); free(log_file);
}
if (data_dir) if (data_dir)
{
strncpy(config.data_dir, data_dir, sizeof(config.data_dir));
free(data_dir); free(data_dir);
}
if (pid_file) if (pid_file)
{
strncpy(config.pid_file, pid_file, sizeof(config.pid_file));
free(pid_file); free(pid_file);
}
if (forked)
config.forked = forked;
if (block_notified)
config.block_notified = block_notified;
log_set_level(LOG_FATAL - config.log_level); log_set_level(LOG_FATAL - config.log_level);
if (config.log_file[0]) if (config.log_file[0])
@ -2983,6 +2987,9 @@ int main(int argc, char **argv)
log_set_fp(fd_log); log_set_fp(fd_log);
} }
print_config();
log_info("Starting pool");
if (config.forked) if (config.forked)
{ {
log_info("Daemonizing"); log_info("Daemonizing");