diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-08-31 13:43:31 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-08-31 13:43:31 +0200 |
| commit | 80444c55e5debc4807df81342e537b5a4e6c4971 (patch) | |
| tree | 00127e6d311ed1fb8907b8ce0fc6a3cdb896329a /src/afb-monitor.c | |
| parent | 11e2d4395056c7bd2a618b4fa7ffdd70af05d14e (diff) | |
verbosity: fixes split verbosity level 1 in 2 levels
The names wasn't correctly reported by monitor
Change-Id: Id382d7fdc3bb56c8c11c865439e7e18c257df3a2
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-monitor.c')
| -rw-r--r-- | src/afb-monitor.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/afb-monitor.c b/src/afb-monitor.c index 9f01cc02..fd334cf9 100644 --- a/src/afb-monitor.c +++ b/src/afb-monitor.c @@ -66,28 +66,28 @@ static int decode_verbosity(struct json_object *v) int level = -1; if (!wrap_json_unpack(v, "i", &level)) { - level = level < 0 ? 0 : level > 3 ? 3 : level; + level = level < Verbosity_Level_Error ? Verbosity_Level_Error : level > Verbosity_Level_Debug ? Verbosity_Level_Debug : level; } else if (!wrap_json_unpack(v, "s", &s)) { switch(*s&~' ') { case 'D': if (!strcasecmp(s, _debug_)) - level = 3; + level = Verbosity_Level_Debug; break; case 'I': if (!strcasecmp(s, _info_)) - level = 2; + level = Verbosity_Level_Info; break; case 'N': if (!strcasecmp(s, _notice_)) - level = 1; + level = Verbosity_Level_Notice; break; case 'W': if (!strcasecmp(s, _warning_)) - level = 1; + level = Verbosity_Level_Warning; break; case 'E': if (!strcasecmp(s, _error_)) - level = 0; + level = Verbosity_Level_Error; break; } } @@ -155,10 +155,11 @@ static void set_verbosity(struct json_object *spec) static struct json_object *encode_verbosity(int level) { switch(level) { - case 0: return json_object_new_string(_error_); - case 1: return json_object_new_string(_notice_); - case 2: return json_object_new_string(_info_); - case 3: return json_object_new_string(_debug_); + case Verbosity_Level_Error: return json_object_new_string(_error_); + case Verbosity_Level_Warning: return json_object_new_string(_warning_); + case Verbosity_Level_Notice: return json_object_new_string(_notice_); + case Verbosity_Level_Info: return json_object_new_string(_info_); + case Verbosity_Level_Debug: return json_object_new_string(_debug_); default: return json_object_new_int(level); } } |