You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/05/19 22:00:16 UTC
[02/12] incubator-mynewt-core git commit: Removing PERUSER
levels/modules and simpliying
Removing PERUSER levels/modules and simpliying
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/d5ffce1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/d5ffce1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/d5ffce1b
Branch: refs/heads/develop
Commit: d5ffce1b69b2bbc70002d002e44b92ad72f1b596
Parents: 070a9dd
Author: Vipul Rahane <vi...@runtime.io>
Authored: Fri Apr 22 19:21:04 2016 -0700
Committer: Vipul Rahane <vi...@runtime.io>
Committed: Tue May 17 12:26:39 2016 -0700
----------------------------------------------------------------------
sys/log/include/log/log.h | 8 ++------
sys/log/src/log_nmgr.c | 27 +++++++++------------------
2 files changed, 11 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d5ffce1b/sys/log/include/log/log.h
----------------------------------------------------------------------
diff --git a/sys/log/include/log/log.h b/sys/log/include/log/log.h
index e58a9f9..07c672c 100644
--- a/sys/log/include/log/log.h
+++ b/sys/log/include/log/log.h
@@ -63,7 +63,6 @@ struct log_entry_hdr {
#define LOG_LEVEL_ERROR (3)
#define LOG_LEVEL_CRITICAL (4)
/* Up to 7 custom log levels. */
-#define LOG_LEVEL_PERUSER (64)
#define LOG_LEVEL_MAX (255)
#define LOG_LEVEL_STR(level) \
@@ -72,8 +71,7 @@ struct log_entry_hdr {
(LOG_LEVEL_WARN == level ? "WARN" :\
(LOG_LEVEL_ERROR == level ? "ERROR" :\
(LOG_LEVEL_CRITICAL == level ? "CRITICAL" :\
- (LOG_LEVEL_PERUSER == level ? "PERUSER" :\
- "UNKNOWN"))))))
+ "UNKNOWN")))))
/* Log module, eventually this can be a part of the filter. */
#define LOG_MODULE_DEFAULT (0)
@@ -82,7 +80,6 @@ struct log_entry_hdr {
#define LOG_MODULE_NIMBLE_CTLR (3)
#define LOG_MODULE_NIMBLE_HOST (4)
#define LOG_MODULE_NFFS (5)
-#define LOG_MODULE_PERUSER (64)
#define LOG_MODULE_MAX (255)
#define LOG_MODULE_STR(module) \
@@ -92,8 +89,7 @@ struct log_entry_hdr {
(LOG_MODULE_NIMBLE_CTLR == module ? "NIMBLE_CTLR" :\
(LOG_MODULE_NIMBLE_HOST == module ? "NIMBLE_HOST" :\
(LOG_MODULE_NFFS == module ? "NFFS" :\
- (LOG_MODULE_PERUSER == module ? "PERUSER" :\
- "UNKNOWN")))))))
+ "UNKNOWN"))))))
/* UTC Timestamnp for Jan 2016 00:00:00 */
#define UTC01_01_2016 1451606400
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d5ffce1b/sys/log/src/log_nmgr.c
----------------------------------------------------------------------
diff --git a/sys/log/src/log_nmgr.c b/sys/log/src/log_nmgr.c
index 20a1b3f..dc71198 100644
--- a/sys/log/src/log_nmgr.c
+++ b/sys/log/src/log_nmgr.c
@@ -268,8 +268,8 @@ log_nmgr_module_list(struct nmgr_jbuf *njb)
json_encode_object_start(encoder);
JSON_VALUE_INT(&jv, NMGR_ERR_EOK);
json_encode_object_entry(encoder, "rc", &jv);
- json_encode_array_name(encoder, "log_module_map");
- json_encode_array_start(encoder);
+ json_encode_object_key(encoder, "module_map");
+ json_encode_object_start(encoder);
while (module < LOG_MODULE_MAX) {
str = LOG_MODULE_STR(module);
@@ -278,19 +278,14 @@ log_nmgr_module_list(struct nmgr_jbuf *njb)
continue;
}
- json_encode_object_start(encoder);
-
- JSON_VALUE_STRING(&jv, LOG_MODULE_STR(module));
- json_encode_object_entry(encoder, "module_name", &jv);
-
JSON_VALUE_UINT(&jv, module);
- json_encode_object_entry(encoder, "module", &jv);
+ json_encode_object_entry(encoder, str, &jv);
- json_encode_object_finish(encoder);
module++;
}
- json_encode_array_finish(encoder);
+
+ json_encode_object_finish(encoder);
json_encode_object_finish(encoder);
return (0);
@@ -309,8 +304,8 @@ log_nmgr_level_list(struct nmgr_jbuf *njb)
json_encode_object_start(encoder);
JSON_VALUE_INT(&jv, NMGR_ERR_EOK);
json_encode_object_entry(encoder, "rc", &jv);
- json_encode_array_name(encoder, "log_level_map");
- json_encode_array_start(encoder);
+ json_encode_object_key(encoder, "level_map");
+ json_encode_object_start(encoder);
while (level < LOG_LEVEL_MAX) {
str = LOG_LEVEL_STR(level);
@@ -318,18 +313,14 @@ log_nmgr_level_list(struct nmgr_jbuf *njb)
level++;
continue;
}
- json_encode_object_start(encoder);
- JSON_VALUE_STRING(&jv, str);
- json_encode_object_entry(encoder, "level_name", &jv);
JSON_VALUE_UINT(&jv, level);
- json_encode_object_entry(encoder, "level", &jv);
+ json_encode_object_entry(encoder, str, &jv);
- json_encode_object_finish(encoder);
level++;
}
- json_encode_array_finish(encoder);
+ json_encode_object_finish(encoder);
json_encode_object_finish(encoder);
return (0);