From 78e262b448e034e96aa75193a76d36cd0062daf7 Mon Sep 17 00:00:00 2001 From: sanine Date: Fri, 24 Sep 2021 22:45:39 -0500 Subject: add getters and setters for log level/file --- src/logging/logging.c | 37 +++++++++++++++++++++++++++++++++---- src/logging/logging.h | 26 +++++++++++++++----------- 2 files changed, 48 insertions(+), 15 deletions(-) (limited to 'src/logging') diff --git a/src/logging/logging.c b/src/logging/logging.c index 77c648c..82895d4 100644 --- a/src/logging/logging.c +++ b/src/logging/logging.c @@ -37,13 +37,42 @@ const char * honey_log_level_str() } -void honey_debug(const char *fmt, ...) +void honey_log_set_level(enum honey_log_level_t level) { - if (honey_log_info.log_level >= DEBUG) { + honey_log_info.log_level = level; +} + + +enum honey_log_level_t honey_log_get_level() +{ + return honey_log_info.log_level; +} + + +void honey_log_set_file(FILE* file) +{ + honey_log_info.log_file = file; +} + + +FILE * honey_log_get_file() +{ + return honey_log_info.log_file; +} + + +void honey_log(enum honey_log_level_t required_level, + const char *prefix, + const char *fmt, ...) +{ + if (honey_log_info.log_file == NULL) + return; + + if (honey_log_info.log_level >= required_level) { va_list args; va_start(args, fmt); - fprintf(honey_log_info.debug_out, "[DEBUG] "); - vfprintf(honey_log_info.debug_out, fmt, args); + fprintf(honey_log_info.log_file, prefix); + vfprintf(honey_log_info.log_file, fmt, args); va_end(args); } } diff --git a/src/logging/logging.h b/src/logging/logging.h index 69ea88e..6589533 100644 --- a/src/logging/logging.h +++ b/src/logging/logging.h @@ -3,24 +3,28 @@ #include +enum honey_log_level_t + { FATAL, ERROR, WARN, INFO, DEBUG }; struct honey_log_info_t { - enum { FATAL, ERROR, WARN, INFO, DEBUG } log_level; - FILE *debug_out; - FILE *info_out; - FILE *warn_out; - FILE *error_out; - FILE *fatal_out; + enum honey_log_level_t log_level; + FILE *log_file; }; extern struct honey_log_info_t honey_log_info; const char * honey_log_level_str(); -void honey_debug(const char *fmt, ...); -void honey_info(const char *fmt, ...); -void honey_warn(const char *fmt, ...); -void honey_error(const char *fmt, ...); -void honey_fatal(const char *fmt, ...); +void honey_log_set_level(enum honey_log_level_t level); +enum honey_log_level_t honey_log_get_level(); + +void honey_log_set_file(FILE *file); +FILE * honey_log_get_file(); + +void honey_log(enum honey_log_level_t required_level, + const char *prefix, + const char *fmt, ...); + +#define honey_debug(...) honey_log(DEBUG, "[DEBUG] ", __VA_ARGS__) #endif -- cgit v1.2.1