mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: log-level applies to messages logged to stderr too

Browse source
This commit is contained in:
Daniel Eklöf 2021-02-09 20:54:17 +01:00
parent fcb524fc72
commit 208014d6c9
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
log.c
View file

@ -13,10 +13,11 @@
static bool colorize = false; static bool colorize = false;
static bool do_syslog = true; static bool do_syslog = true;
static enum log_class log_level = LOG_CLASS_INFO;
void void
log_init(enum log_colorize _colorize, bool _do_syslog, log_init(enum log_colorize _colorize, bool _do_syslog,
enum log_facility syslog_facility, enum log_class syslog_level) enum log_facility syslog_facility, enum log_class _log_level)
{ {
static const int facility_map[] = { static const int facility_map[] = {
[LOG_FACILITY_USER] = LOG_USER, [LOG_FACILITY_USER] = LOG_USER,
@ -32,10 +33,11 @@ log_init(enum log_colorize _colorize, bool _do_syslog,
colorize = _colorize == LOG_COLORIZE_NEVER ? false : _colorize == LOG_COLORIZE_ALWAYS ? true : isatty(STDERR_FILENO); colorize = _colorize == LOG_COLORIZE_NEVER ? false : _colorize == LOG_COLORIZE_ALWAYS ? true : isatty(STDERR_FILENO);
do_syslog = _do_syslog; do_syslog = _do_syslog;
log_level = _log_level;
if (do_syslog) { if (do_syslog) {
openlog(NULL, /*LOG_PID*/0, facility_map[syslog_facility]); openlog(NULL, /*LOG_PID*/0, facility_map[syslog_facility]);
setlogmask(LOG_UPTO(level_map[syslog_level])); setlogmask(LOG_UPTO(level_map[_log_level]));
} }
} }
@ -50,6 +52,9 @@ static void
_log(enum log_class log_class, const char *module, const char *file, int lineno, _log(enum log_class log_class, const char *module, const char *file, int lineno,
const char *fmt, int sys_errno, va_list va) const char *fmt, int sys_errno, va_list va)
{ {
if (log_class > log_level)
return;
const char *class = "abcd"; const char *class = "abcd";
int class_clr = 0; int class_clr = 0;
switch (log_class) { switch (log_class) {

2
log.h
View file

@ -7,7 +7,7 @@ enum log_facility { LOG_FACILITY_USER, LOG_FACILITY_DAEMON };
enum log_class { LOG_CLASS_ERROR, LOG_CLASS_WARNING, LOG_CLASS_INFO, LOG_CLASS_DEBUG }; enum log_class { LOG_CLASS_ERROR, LOG_CLASS_WARNING, LOG_CLASS_INFO, LOG_CLASS_DEBUG };
void log_init(enum log_colorize colorize, bool do_syslog, void log_init(enum log_colorize colorize, bool do_syslog,
enum log_facility syslog_facility, enum log_class syslog_level); enum log_facility syslog_facility, enum log_class log_level);
void log_deinit(void); void log_deinit(void);
void log_msg(enum log_class log_class, const char *module, void log_msg(enum log_class log_class, const char *module,