Make logging module/level prefix optional
This commit is contained in:
parent
882be25428
commit
521d5c5aec
|
@ -60,6 +60,13 @@
|
||||||
#define LOG_WITH_LOC 0
|
#define LOG_WITH_LOC 0
|
||||||
#endif /* LOG_CONF_WITH_LOC */
|
#endif /* LOG_CONF_WITH_LOC */
|
||||||
|
|
||||||
|
/* Prefix all logs with Module name and logging level */
|
||||||
|
#ifdef LOG_CONF_WITH_MODULE_PREFIX
|
||||||
|
#define LOG_WITH_MODULE_PREFIX LOG_CONF_WITH_MODULE_PREFIX
|
||||||
|
#else /* LOG_CONF_WITH_MODULE_PREFIX */
|
||||||
|
#define LOG_WITH_MODULE_PREFIX 1
|
||||||
|
#endif /* LOG_CONF_WITH_MODULE_PREFIX */
|
||||||
|
|
||||||
/* Cooja annotations */
|
/* Cooja annotations */
|
||||||
#ifdef LOG_CONF_WITH_ANNOTATE
|
#ifdef LOG_CONF_WITH_ANNOTATE
|
||||||
#define LOG_WITH_ANNOTATE LOG_CONF_WITH_ANNOTATE
|
#define LOG_WITH_ANNOTATE LOG_CONF_WITH_ANNOTATE
|
||||||
|
|
|
@ -98,7 +98,9 @@ extern struct log_module all_modules[];
|
||||||
#define LOG(newline, level, levelstr, ...) do { \
|
#define LOG(newline, level, levelstr, ...) do { \
|
||||||
if(level <= (LOG_LEVEL)) { \
|
if(level <= (LOG_LEVEL)) { \
|
||||||
if(newline) { \
|
if(newline) { \
|
||||||
|
if(LOG_WITH_MODULE_PREFIX) { \
|
||||||
LOG_OUTPUT("[%-4s: %-10s] ", levelstr, LOG_MODULE); \
|
LOG_OUTPUT("[%-4s: %-10s] ", levelstr, LOG_MODULE); \
|
||||||
|
} \
|
||||||
if(LOG_WITH_LOC) { \
|
if(LOG_WITH_LOC) { \
|
||||||
LOG_OUTPUT("[%s: %d] ", __FILE__, __LINE__); \
|
LOG_OUTPUT("[%s: %d] ", __FILE__, __LINE__); \
|
||||||
} \
|
} \
|
||||||
|
|
Loading…
Reference in New Issue