Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-14 05:53:01 +01:00
Code Issues Projects Releases Wiki Activity

Add the ability to log to file (#84)

Browse Source
This commit is contained in:
JFreegman 2020-05-16 23:12:54 -04:00 committed by GitHub
parent bdeae33d48
commit 4bda799a4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/toxic.c
View File

@ -191,6 +191,10 @@ void exit_toxic_success(Tox *m)
terminate_python();
#endif /* PYTHON */
if (arg_opts.log_fp) {
fclose(arg_opts.log_fp);
}
free_global_data();
tox_kill(m);
endwin();
@ -226,7 +230,12 @@ void cb_toxcore_logger(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t l
UNUSED_VAR(file);
UNUSED_VAR(m);
fprintf(stderr, "[%d] %u:%s() - %s\n", level, line, func, message);
if (user_data) {
FILE *fp = (FILE *)user_data;
fprintf(fp, "[%d] %u:%s() - %s\n", level, line, func, message);
} else {
fprintf(stderr, "[%d] %u:%s() - %s\n", level, line, func, message);
}
}
static void init_term(void)
@ -657,6 +666,10 @@ static void init_tox_options(struct Tox_Options *tox_opts)
if (arg_opts.logging) {
tox_options_set_log_callback(tox_opts, cb_toxcore_logger);
if (arg_opts.log_fp != NULL) {
tox_options_set_log_user_data(tox_opts, arg_opts.log_fp);
}
}
if (!tox_options_get_ipv6_enabled(tox_opts)) {
@ -956,7 +969,7 @@ static void print_usage(void)
fprintf(stderr, " -e, --encrypt-data Encrypt an unencrypted data file\n");
fprintf(stderr, " -f, --file Use specified data file\n");
fprintf(stderr, " -h, --help Show this message and exit\n");
fprintf(stderr, " -l, --logging Enable toxcore logging to stderr\n");
fprintf(stderr, " -l, --logging Enable toxcore logging: Requires [log_path | stderr]\n");
fprintf(stderr, " -n, --nodes Use specified DHTnodes file\n");
fprintf(stderr, " -o, --noconnect Do not connect to the DHT network\n");
fprintf(stderr, " -p, --SOCKS5-proxy Use SOCKS5 proxy: Requires [IP] [port]\n");
@ -993,7 +1006,7 @@ static void parse_args(int argc, char *argv[])
{"default-locale", no_argument, 0, 'd'},
{"config", required_argument, 0, 'c'},
{"encrypt-data", no_argument, 0, 'e'},
{"logging", no_argument, 0, 'l'},
{"logging", required_argument, 0, 'l'},
{"nodes", required_argument, 0, 'n'},
{"help", no_argument, 0, 'h'},
{"noconnect", no_argument, 0, 'o'},
@ -1007,7 +1020,7 @@ static void parse_args(int argc, char *argv[])
{NULL, no_argument, NULL, 0},
};
const char *opts_str = "4bdehlotuxvc:f:n:r:p:P:T:";
const char *opts_str = "4bdehotuxvc:f:l:n:r:p:P:T:";
int opt, indexptr;
long int port = 0;
@ -1072,9 +1085,24 @@ static void parse_args(int argc, char *argv[])
break;
case 'l':
arg_opts.debug = true;
arg_opts.logging = true;
queue_init_message("Toxcore logging enabled to stderr");
if (optarg) {
arg_opts.logging = true;
if (strcmp(optarg, "stderr") != 0) {
arg_opts.log_fp = fopen(optarg, "w");
if (arg_opts.log_fp != NULL) {
queue_init_message("Toxcore logging enabled to %s", optarg);
} else {
arg_opts.debug = true;
queue_init_message("Failed to open log file %s. Falling back to stderr.", optarg);
}
} else {
arg_opts.debug = true;
queue_init_message("Toxcore logging enabled to stderr");
}
}
break;
case 'n':
@ -1436,4 +1464,4 @@ int main(int argc, char **argv)
}
return 0;
}
}

4
src/windows.h
View File

@ -89,12 +89,14 @@ struct arg_opts {
bool no_connect;
bool encrypt_data;
bool unencrypt_data;
bool logging;
char nameserver_path[MAX_STR_SIZE];
char config_path[MAX_STR_SIZE];
char nodes_path[MAX_STR_SIZE];
bool logging;
FILE *log_fp;
char proxy_address[256];
uint8_t proxy_type;
uint16_t proxy_port;