From 6fdc692aa523a642770747042c82153933fa734c Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 6 May 2019 10:16:48 +0100 Subject: Support DEBUG log level in console_log Signed-off-by: Daniel Silverstone --- desktop/browser.c | 3 +++ frontends/monkey/browser.c | 3 +++ include/netsurf/console.h | 13 ++++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/desktop/browser.c b/desktop/browser.c index 366140770..9795f96a1 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -3458,6 +3458,9 @@ nserror browser_window_console_log(struct browser_window *bw, "unknown input location")); switch (log_level) { + case BW_CS_FLAG_LEVEL_DEBUG: + NSLOG(netsurf, DEBUG, "%.*s", (int)msglen, msg); + break; case BW_CS_FLAG_LEVEL_LOG: NSLOG(netsurf, VERBOSE, "%.*s", (int)msglen, msg); break; diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c index 903c4538f..b7aea92c9 100644 --- a/frontends/monkey/browser.c +++ b/frontends/monkey/browser.c @@ -378,6 +378,9 @@ gui_window_console_log(struct gui_window *g, } switch (flags & BW_CS_FLAG_LEVEL_MASK) { + case BW_CS_FLAG_LEVEL_DEBUG: + level_text = "DEBUG"; + break; case BW_CS_FLAG_LEVEL_LOG: level_text = "LOG"; break; diff --git a/include/netsurf/console.h b/include/netsurf/console.h index 31ed0e787..dead3fd2e 100644 --- a/include/netsurf/console.h +++ b/include/netsurf/console.h @@ -49,16 +49,19 @@ typedef enum { */ BW_CS_FLAG_FOLDABLE = 1 << 0, + /** Logged at the 'debug' level, please use only one of the LEVEL flags */ + BW_CS_FLAG_LEVEL_DEBUG = 0 << 1, /** Logged at the 'log' level, please only use one of the LEVEL flags */ - BW_CS_FLAG_LEVEL_LOG = 0 << 1, + BW_CS_FLAG_LEVEL_LOG = 1 << 1, /** Logged at the 'info' level, please use only one of the LEVEL flags */ - BW_CS_FLAG_LEVEL_INFO = 1 << 1, + BW_CS_FLAG_LEVEL_INFO = 2 << 1, /** Logged at the 'warn' level, please use only one of the LEVEL flags */ - BW_CS_FLAG_LEVEL_WARN = 2 << 1, + BW_CS_FLAG_LEVEL_WARN = 3 << 1, /** Logged at the 'error' level, please use only one of the LEVEL flags */ - BW_CS_FLAG_LEVEL_ERROR = 3 << 1, + BW_CS_FLAG_LEVEL_ERROR = 4 << 1, + /* Levels 5, 6, 7 unused as yet */ /** Mask for the error level to allow easy comparison using the above */ - BW_CS_FLAG_LEVEL_MASK = 3 << 1, + BW_CS_FLAG_LEVEL_MASK = 7 << 1, } browser_window_console_flags; #endif /* _NETSURF_CONSOLE_H_ */ -- cgit v1.2.3