X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-monitor.c;h=fd334cf9f43aa5c0950554f0d8ca86c0aed16422;hb=a63851bb4726c89d9a3c5755d78d1c4bbc3f3b2e;hp=369c5bf5d4ab7fb7adbe157a2d0d42fa0909b8c1;hpb=53c7b44e96e6015a4da4f88f22e98b13cfa2e056;p=src%2Fapp-framework-binder.git diff --git a/src/afb-monitor.c b/src/afb-monitor.c index 369c5bf5..fd334cf9 100644 --- a/src/afb-monitor.c +++ b/src/afb-monitor.c @@ -28,6 +28,7 @@ #include "afb-apiset.h" #include "afb-api-so-v2.h" #include "afb-ditf.h" +#include "afb-evt.h" #include "afb-xreq.h" #include "afb-trace.h" #include "verbose.h" @@ -65,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; } } @@ -154,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); } } @@ -345,13 +347,16 @@ static void f_trace(struct afb_req req) if (add) { rc = afb_trace_add(req, add, trace); if (rc) - return; + goto end; } if (drop) { rc = afb_trace_drop(req, drop, trace); if (rc) - return; + goto end; } afb_req_success(req, NULL, NULL); +end: + afb_apiset_update_hooks(main_apiset, NULL); + afb_evt_update_hooks(); }