Merge branch 'fix/none_log_level' into 'main'

diagnostics: not to wrap logging APIs if log level is NONE See merge request app-frameworks/esp-insights!161
espressif · Dec 7, 2023 · c9605b3 · c9605b3
2 parents cfdd71e + 2990bb3
commit c9605b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/components/esp_diagnostics/CMakeLists.txt b/components/esp_diagnostics/CMakeLists.txt
@@ -34,8 +34,10 @@ idf_component_register(SRCS "${srcs}"
                     INCLUDE_DIRS "include"
                     PRIV_REQUIRES ${priv_req})
 
-if(NOT CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP)
-    set(WRAP_FUNCTIONS esp_log_write esp_log_writev)
+# If log level is set to NONE or if logging APIs are externally wrapped then skip
+# wrapping logging APIs here
+if ((NOT CONFIG_LOG_DEFAULT_LEVEL_NONE) AND (NOT CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP))
+    list(APPEND WRAP_FUNCTIONS esp_log_write esp_log_writev)
 endif()
 
 if(CONFIG_LIB_BUILDER_COMPILE)

diff --git a/components/esp_diagnostics/idf_component.yml b/components/esp_diagnostics/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.1"
+version: "1.0.2"
 description: Diagnostics component used in ESP Insights, which is a remote diagnostics solution to monitor the health of ESP devices in the field.
 url: https://github.com/espressif/esp-insights/tree/main/components/esp_diagnostics
 repository: https://github.com/espressif/esp-insights.git