summaryrefslogtreecommitdiff
path: root/include/sal
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-08-18 14:07:00 +0300
committerTor Lillqvist <tml@collabora.com>2016-08-18 14:20:17 +0300
commitfb00c725bba8b5ea30d47d28d0e54c071f1fe2a6 (patch)
tree84a82f654e0fcc56503b07266db5e980f8535428 /include/sal
parentf8ba7ff1e57bc769a4437c10b11200a6c0b122d9 (diff)
Add handling of a +TIMESTAMP flag in the SAL_LOG environment variable
Change-Id: I9bdcd8b2d7b46a087d7f5461b6f7c3d9f02ec084
Diffstat (limited to 'include/sal')
-rw-r--r--include/sal/log.hxx28
1 files changed, 17 insertions, 11 deletions
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index e01d70870042..9465486bdee7 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -228,15 +228,21 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
with
@verbatim
- <switch> ::= <sense><level>("."<area>)?
+ <switch> ::= <sense><item>
<sense> ::= "+"|"-"
+ <item> ::= <flag>|<level>("."<area>)?
+ <flag> ::= "TIMESTAMP"
<level> ::= "INFO"|"WARN"
@endverbatim
- If the environment variable is unset, "+WARN" is used instead (which results
- in all warnings being output but no infos). If the given value does not
- match the regular expression, "+INFO+WARN" is used instead (which in turn
- results in everything being output).
+ If the environment variable is unset, or contains no level, the level
+ setting "+WARN" is assumed instead (which results in all warnings being
+ output but no infos). If the given value does not match the regular
+ expression, "+INFO+WARN" is used instead (which in turn results in
+ everything being output).
+
+ The "+TIMESTAMP" flag causes each output line (as selected by the level
+ switch(es)) to be prefixed by a timestamp like 2016-08-18:14:04:43.672.
A given macro call's level (INFO or WARN) and area is matched against the
given switches as follows: Only those switches for which the level matches
@@ -251,12 +257,12 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
SAL_INFO("other", ...) generate output, while calls like
SAL_INFO("foo", ...) or SAL_INFO("foo.barzzz", ...) do not.
- The generated log output consists of the given level ("info" or "warn"), the
- given area, the process ID, the thread ID, the source file, and the source
- line number, each followed by a colon, followed by a space, the given
- message, and a newline. The precise format of the log output is subject to
- change. The log output is printed to stderr without further text encoding
- conversion.
+ The generated log output consists of the optinal timestamp, the given level
+ ("info" or "warn"), the given area, the process ID, the thread ID, the
+ source file, and the source line number, each followed by a colon, followed
+ by a space, the given message, and a newline. The precise format of the log
+ output is subject to change. The log output is printed to stderr without
+ further text encoding conversion.
@see @ref sal_log_areas