diff options
author | Carlo von lynX <lynX@time.to.get.psyced.org> | 2016-08-08 19:51:46 +0000 |
---|---|---|
committer | Carlo von lynX <lynX@time.to.get.psyced.org> | 2016-08-08 19:51:46 +0000 |
commit | 06f44db8a9a4c1b6b4a2a4a707067feb7164e609 (patch) | |
tree | 70d992450fe010e5ef8c2fd8882b745bb8841772 /src/util | |
parent | 86a3fcdd55ad2cb221fbc2d495a90def1532b01a (diff) | |
download | gnunet-06f44db8a9a4c1b6b4a2a4a707067feb7164e609.tar.gz gnunet-06f44db8a9a4c1b6b4a2a4a707067feb7164e609.zip |
Merge branch 'master' of /RAM/proj/gnunet
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/common_logging.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 4d78f4898..a80081011 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c | |||
@@ -256,6 +256,8 @@ get_type (const char *log) | |||
256 | if (0 == strcasecmp (log, _("DEBUG"))) | 256 | if (0 == strcasecmp (log, _("DEBUG"))) |
257 | return GNUNET_ERROR_TYPE_DEBUG; | 257 | return GNUNET_ERROR_TYPE_DEBUG; |
258 | if (0 == strcasecmp (log, _("INFO"))) | 258 | if (0 == strcasecmp (log, _("INFO"))) |
259 | return GNUNET_ERROR_TYPE_MESSAGE; | ||
260 | if (0 == strcasecmp (log, _("MESSAGE"))) | ||
259 | return GNUNET_ERROR_TYPE_INFO; | 261 | return GNUNET_ERROR_TYPE_INFO; |
260 | if (0 == strcasecmp (log, _("WARNING"))) | 262 | if (0 == strcasecmp (log, _("WARNING"))) |
261 | return GNUNET_ERROR_TYPE_WARNING; | 263 | return GNUNET_ERROR_TYPE_WARNING; |
@@ -520,9 +522,10 @@ GNUNET_get_log_call_status (int caller_level, | |||
520 | if (min_level >= 0) | 522 | if (min_level >= 0) |
521 | return caller_level <= min_level; | 523 | return caller_level <= min_level; |
522 | /* All programs/services previously defaulted to WARNING. | 524 | /* All programs/services previously defaulted to WARNING. |
523 | * Now WE default to WARNING, and THEY default to NULL. | 525 | * Now *we* default to WARNING, and THEY default to NULL. |
526 | * Or rather we default to MESSAGE, since things aren't always bad. | ||
524 | */ | 527 | */ |
525 | return caller_level <= GNUNET_ERROR_TYPE_WARNING; | 528 | return caller_level <= GNUNET_ERROR_TYPE_MESSAGE; |
526 | } | 529 | } |
527 | 530 | ||
528 | 531 | ||
@@ -1066,6 +1069,8 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind) | |||
1066 | return _("ERROR"); | 1069 | return _("ERROR"); |
1067 | if ((kind & GNUNET_ERROR_TYPE_WARNING) > 0) | 1070 | if ((kind & GNUNET_ERROR_TYPE_WARNING) > 0) |
1068 | return _("WARNING"); | 1071 | return _("WARNING"); |
1072 | if ((kind & GNUNET_ERROR_TYPE_MESSAGE) > 0) | ||
1073 | return _("MESSAGE"); | ||
1069 | if ((kind & GNUNET_ERROR_TYPE_INFO) > 0) | 1074 | if ((kind & GNUNET_ERROR_TYPE_INFO) > 0) |
1070 | return _("INFO"); | 1075 | return _("INFO"); |
1071 | if ((kind & GNUNET_ERROR_TYPE_DEBUG) > 0) | 1076 | if ((kind & GNUNET_ERROR_TYPE_DEBUG) > 0) |