From 7d8fffde9002e0ca9420665d12b64a8b11238b97 Mon Sep 17 00:00:00 2001 From: samanway-dey Date: Thu, 21 Feb 2019 21:56:14 +0530 Subject: [PATCH] Hiding Privacy Logs for LUX Changing INFO level private log to INFO_PRIVATE level for LUX PRA. https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/433 (cherry picked from b1e404691b0293404dcc4bd51c94ea029f885a87) Change-Id: I91a33553988de53d228c0e6b9179d212c1e87b4f Signed-off-by: samanway-dey Signed-off-by: DoHyun Pyun --- packaging/iotivity.spec | 2 ++ resource/csdk/connectivity/src/adapter_util/caadapterutils.c | 2 +- resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c | 2 +- resource/csdk/connectivity/src/camessagehandler.c | 2 +- resource/csdk/logger/include/logger.h | 4 ++-- resource/csdk/stack/src/ocresource.c | 2 +- tools/tizen/iotivity-vd-tv-es-tizen30.spec | 2 ++ tools/tizen/iotivity-vd-tv-tizen30.spec | 2 ++ tools/tizen/iotivity.spec | 3 +++ 9 files changed, 15 insertions(+), 6 deletions(-) mode change 100755 => 100644 resource/csdk/connectivity/src/camessagehandler.c mode change 100755 => 100644 resource/csdk/stack/src/ocresource.c diff --git a/packaging/iotivity.spec b/packaging/iotivity.spec index 764c963..d09744a 100755 --- a/packaging/iotivity.spec +++ b/packaging/iotivity.spec @@ -35,6 +35,7 @@ Source1002: %{name}-test.manifest # For Example %if %{RELEASE} == "True" %define build_mode release +%define log_level INFO %else %define build_mode debug %endif @@ -186,6 +187,7 @@ scons %{JOB} --prefix=%{_prefix} \ BLE_TIZEN_30=%{BLE_TIZEN_30} \ DISABLE_BLE_SERVER=%{DISABLE_BLE_SERVER} \ MULTIPLE_OWNER=%{MULTIPLE_OWNER} \ + LOG_LEVEL=%{log_level} \ #eol %install diff --git a/resource/csdk/connectivity/src/adapter_util/caadapterutils.c b/resource/csdk/connectivity/src/adapter_util/caadapterutils.c index 762949c..2b837b0 100644 --- a/resource/csdk/connectivity/src/adapter_util/caadapterutils.c +++ b/resource/csdk/connectivity/src/adapter_util/caadapterutils.c @@ -379,7 +379,7 @@ void CALogSendStateInfo(CATransportAdapter_t adapter, } CALogAdapterTypeInfo(adapter); - OIC_LOG_V(INFO, ANALYZER_TAG, "Address = [%s]:[%d]", addr, port); + OIC_LOG_V(INFO_PRIVATE, ANALYZER_TAG, "Address = [%s]:[%d]", addr, port); OIC_LOG(DEBUG, ANALYZER_TAG, "================================================="); // samsung log diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c index b89616e..084ea7d 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c @@ -338,7 +338,7 @@ void CALEGattConnectionStateChanged(bool connected, const char *remoteAddress) if (CA_STATUS_OK != CAGetLEServerInfo(g_LEServerList, remoteAddress, &serverInfo)) { oc_mutex_unlock(g_LEServerListMutex); - OIC_LOG_V(ERROR, TAG, "Could not get server info for [%s]", remoteAddress); + OIC_LOG_V(ERROR, TAG, "Could not get server info!"); return; } diff --git a/resource/csdk/connectivity/src/camessagehandler.c b/resource/csdk/connectivity/src/camessagehandler.c old mode 100755 new mode 100644 index ebd322b..882ddd4 --- a/resource/csdk/connectivity/src/camessagehandler.c +++ b/resource/csdk/connectivity/src/camessagehandler.c @@ -1673,7 +1673,7 @@ static void CALogPDUInfo(const CAData_t *data, const coap_pdu_t *pdu) OIC_LOG_BUFFER(INFO, ANALYZER_TAG, (const uint8_t *) info->token, info->tokenLength); OIC_TRACE_BUFFER("OIC_CA_MSG_HANDLE:CALogPDUInfo:token", (const uint8_t *) info->token, info->tokenLength); - OIC_LOG_V(INFO, ANALYZER_TAG, "Res URI = [%s]", info->resourceUri); + OIC_LOG_V(INFO_PRIVATE, ANALYZER_TAG, "Res URI = [%s]", info->resourceUri); OIC_TRACE_MARK(%s:CALogPDUInfo:uri:%s, TAG, info->resourceUri); if (CA_FORMAT_APPLICATION_CBOR == info->payloadFormat) diff --git a/resource/csdk/logger/include/logger.h b/resource/csdk/logger/include/logger.h index af95bc8..3444454 100644 --- a/resource/csdk/logger/include/logger.h +++ b/resource/csdk/logger/include/logger.h @@ -67,8 +67,8 @@ extern "C" // Log levels #ifdef __TIZEN__ typedef enum { - DEBUG = DLOG_INFO, // DLOG_INFO : 4 - INFO = DLOG_INFO, + DEBUG = DLOG_DEBUG, // DLOG_DEBUG : 3 + INFO = DLOG_INFO, // DLOG_INFO : 4 WARNING = DLOG_WARN, // DLOG_WARN : 5 ERROR = DLOG_ERROR, // DLOG_ERROR : 6 FATAL = DLOG_ERROR, diff --git a/resource/csdk/stack/src/ocresource.c b/resource/csdk/stack/src/ocresource.c old mode 100755 new mode 100644 index 622f43d..7ffdcc1 --- a/resource/csdk/stack/src/ocresource.c +++ b/resource/csdk/stack/src/ocresource.c @@ -160,7 +160,7 @@ OCStackResult ExtractFiltersFromQuery(const char *query, char **filterOne, char return OC_STACK_NO_MEMORY; } - OIC_LOG_V(INFO, TAG, "Extracting params from %s", queryDup); + OIC_LOG_V(INFO_PRIVATE, TAG, "Extracting params from %s", queryDup); OCStackResult eCode = OC_STACK_INVALID_QUERY; if (strnlen(queryDup, MAX_QUERY_LENGTH) >= MAX_QUERY_LENGTH) diff --git a/tools/tizen/iotivity-vd-tv-es-tizen30.spec b/tools/tizen/iotivity-vd-tv-es-tizen30.spec index 97da3c7..d97a122 100644 --- a/tools/tizen/iotivity-vd-tv-es-tizen30.spec +++ b/tools/tizen/iotivity-vd-tv-es-tizen30.spec @@ -35,6 +35,7 @@ Source1002: %{name}-test.manifest # For Example %if %{RELEASE} == "True" %define build_mode release +%define log_level INFO %else %define build_mode debug %endif @@ -184,6 +185,7 @@ scons %{JOB} --prefix=%{_prefix} \ BLE_TIZEN_30=%{BLE_TIZEN_30} \ DISABLE_BLE_SERVER=%{DISABLE_BLE_SERVER} \ MULTIPLE_OWNER=%{MULTIPLE_OWNER} \ + LOG_LEVEL=%{log_level} \ #eol %install diff --git a/tools/tizen/iotivity-vd-tv-tizen30.spec b/tools/tizen/iotivity-vd-tv-tizen30.spec index 8c6bd80..ce7f628 100644 --- a/tools/tizen/iotivity-vd-tv-tizen30.spec +++ b/tools/tizen/iotivity-vd-tv-tizen30.spec @@ -35,6 +35,7 @@ Source1002: %{name}-test.manifest # For Example %if %{RELEASE} == "True" %define build_mode release +%define log_level INFO %else %define build_mode debug %endif @@ -184,6 +185,7 @@ scons %{JOB} --prefix=%{_prefix} \ BLE_TIZEN_30=%{BLE_TIZEN_30} \ DISABLE_BLE_SERVER=%{DISABLE_BLE_SERVER} \ MULTIPLE_OWNER=%{MULTIPLE_OWNER} \ + LOG_LEVEL=%{log_level} \ #eol %install diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec index e571f22..2817e65 100644 --- a/tools/tizen/iotivity.spec +++ b/tools/tizen/iotivity.spec @@ -35,6 +35,7 @@ Source1002: %{name}-test.manifest # For Example %if %{RELEASE} == "True" %define build_mode release +%define log_level INFO %else %define build_mode debug %endif @@ -182,6 +183,8 @@ scons %{JOB} --prefix=%{_prefix} \ BLE_TIZEN_30=%{BLE_TIZEN_30} \ DISABLE_BLE_SERVER=%{DISABLE_BLE_SERVER} \ MULTIPLE_OWNER=%{MULTIPLE_OWNER} \ + OIC_SUPPORT_TIZEN_TRACE=%{OIC_SUPPORT_TIZEN_TRACE} \ + LOG_LEVEL=%{log_level} \ #eol %install -- 2.7.4