diff options
| author | Youngjae Cho <y0.cho@samsung.com> | 2020-11-24 13:59:59 +0900 |
|---|---|---|
| committer | Hyotaek Shim <hyotaek.shim@samsung.com> | 2020-11-25 03:06:32 +0000 |
| commit | ed81b92bcc0eb2ba9d359bd2f1b3716f9dabef9f (patch) | |
| tree | 6d497760ac3fad95bdf33a4119601a54d1823ad2 | |
| parent | 3885c8d044be51035d6be1d62e795a9941e5fa65 (diff) | |
| download | deviced-submit/tizen_6.0/20201125.031050.tar.gz deviced-submit/tizen_6.0/20201125.031050.tar.bz2 deviced-submit/tizen_6.0/20201125.031050.zip | |
Make critical-log configurablesubmit/tizen_6.0/20201125.031050accepted/tizen/6.0/unified/20201125.104952
Change-Id: I67eb3788a78f5ce02dacb85f8c3398d5f54fd947
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>
(cherry picked from commit 86777773919c53dfd5d2b8abe406f4e64c5998fb)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | conf/critical-log.conf | 13 | ||||
| -rw-r--r-- | packaging/deviced.spec | 1 | ||||
| -rw-r--r-- | src/shared/log-macro.h | 6 |
4 files changed, 8 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bfcc69a..b104d6e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,7 +282,7 @@ IF(USB_MODULE STREQUAL on) ENDIF() IF(CRITICAL_LOG_MODULE STREQUAL on) - INSTALL_CONF(conf critical-log) + ADD_DEFINITIONS("-DCRITICAL_LOG_ON") ENDIF() CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) diff --git a/conf/critical-log.conf b/conf/critical-log.conf deleted file mode 100644 index 0f764455..00000000 --- a/conf/critical-log.conf +++ /dev/null @@ -1,13 +0,0 @@ -#Critical Log will be saved under the /var/log/ghost/boot/#booting_count -#Critical Log Format is "Section|String Value" -#Limit means Last Critical Log Logging Count -[Common] -Limit=100 -[Battery] -Limit=20 -[BatteryHealth] -Limit=10 -[PowerHandle] -Limit=10 -[CoolDown] -Limit=10 diff --git a/packaging/deviced.spec b/packaging/deviced.spec index db438a9e..bd7d771a 100644 --- a/packaging/deviced.spec +++ b/packaging/deviced.spec @@ -165,6 +165,7 @@ Plugin libraries for IoT devices -DTOUCH_SENSITIVITY_MODULE=on \ -DDUMP_MODULE=on \ -DDEVICE_BOARD_MODULE=on \ + -DCRITICAL_LOG_MODULE=on \ #eol %build diff --git a/src/shared/log-macro.h b/src/shared/log-macro.h index 773ea444..440300f3 100644 --- a/src/shared/log-macro.h +++ b/src/shared/log-macro.h @@ -22,9 +22,14 @@ #ifdef ENABLE_DLOG #include <dlog.h> + /* critical log */ +#ifdef CRITICAL_LOG_ON #define CRITICAL_LOG(fmt, arg...) \ do { CRITICAL_LOG_(LOG_ID_SYSTEM, DLOG_INFO, LOG_TAG, fmt, ##arg); } while (0) +#else +#define CRITICAL_LOG(fmt, arg...) _I(fmt, ##arg) +#endif #define _D(fmt, arg...) \ do { SLOGD(fmt, ##arg); } while (0) @@ -43,6 +48,7 @@ #define _SE(fmt, arg...) \ do { SECURE_SLOGE(fmt, ##arg); } while (0) #else +#define CRITICAL_LOG(...) do { } while (0) #define _D(...) do { } while (0) #define _I(...) do { } while (0) #define _W(...) do { } while (0) |