From: jake Date: Mon, 27 Feb 2017 07:18:38 +0000 (+0900) Subject: Update Update OCF log level for NS LOG. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca35f2b3850977ca6dec81ef13614ed09adb319c;p=contrib%2Fiotivity.git Update Update OCF log level for NS LOG. - Change DEBUG to INFO_PRIVATE in NS LOG with private data Change-Id: I69a764e8a1fc9c1cc4a1a4e9785d658dd9d754bd Signed-off-by: jake Reviewed-on: https://gerrit.iotivity.org/gerrit/17523 Reviewed-by: Chihyun Cho Reviewed-by: Uze Choi Tested-by: jenkins-iotivity Reviewed-by: JungYong KIM --- diff --git a/service/notification/cpp-wrapper/consumer/src/NSAcceptedProviders.cpp b/service/notification/cpp-wrapper/consumer/src/NSAcceptedProviders.cpp index 28ffe41..ac2408c 100755 --- a/service/notification/cpp-wrapper/consumer/src/NSAcceptedProviders.cpp +++ b/service/notification/cpp-wrapper/consumer/src/NSAcceptedProviders.cpp @@ -43,7 +43,7 @@ namespace OIC void NSAcceptedProviders::addProvider(std::shared_ptr provider) { std::lock_guard lock(m_mutex); - NS_LOG_V(DEBUG, "AcceptedProviders::addProvider Id : %s", provider->getProviderId().c_str()); + NS_LOG_V(INFO_PRIVATE, "AcceptedProviders::addProvider Id : %s", provider->getProviderId().c_str()); m_providers[provider->getProviderId()] = provider; return; } @@ -51,7 +51,7 @@ namespace OIC void NSAcceptedProviders::removeProvider(const std::string &id) { std::lock_guard lock(m_mutex); - NS_LOG_V(DEBUG, "AcceptedProviders::removeProvider Id : %s", id.c_str()); + NS_LOG_V(INFO_PRIVATE, "AcceptedProviders::removeProvider Id : %s", id.c_str()); m_providers.erase(id); return; } @@ -59,7 +59,7 @@ namespace OIC bool NSAcceptedProviders::isAccepted(const std::string &id) { std::lock_guard lock(m_mutex); - NS_LOG_V(DEBUG, "AcceptedProviders::isAccepted Id : %s", id.c_str()); + NS_LOG_V(INFO_PRIVATE, "AcceptedProviders::isAccepted Id : %s", id.c_str()); if ( m_providers.find(id) == m_providers.end() ) { NS_LOG(DEBUG, "isAccepted : Not Found Provider with given ID"); diff --git a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp index 48debdf..d242919 100755 --- a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp +++ b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp @@ -35,7 +35,7 @@ namespace OIC void NSConsumerService::onProviderStateReceived(::NSProvider *provider, ::NSProviderState state) { NS_LOG(DEBUG, "onNSProviderStateChanged - IN"); - NS_LOG_V(DEBUG, "provider Id : %s", provider->providerId); + NS_LOG_V(INFO_PRIVATE, "provider Id : %s", provider->providerId); NS_LOG_V(DEBUG, "state : %d", (int)state); std::string provId; @@ -164,7 +164,7 @@ namespace OIC void NSConsumerService::onNSMessageReceived(::NSMessage *message) { NS_LOG(DEBUG, "onNSMessageReceived - IN"); - NS_LOG_V(DEBUG, "message->providerId : %s", message->providerId); + NS_LOG_V(INFO_PRIVATE, "message->providerId : %s", message->providerId); NSMessage nsMessage(message); @@ -190,7 +190,7 @@ namespace OIC void NSConsumerService::onNSSyncInfoReceived(::NSSyncInfo *syncInfo) { NS_LOG(DEBUG, "onNSSyncInfoReceived - IN"); - NS_LOG_V(DEBUG, "syncInfo->providerId : %s", syncInfo->providerId); + NS_LOG_V(INFO_PRIVATE, "syncInfo->providerId : %s", syncInfo->providerId); NSSyncInfo nsSyncInfo(syncInfo); @@ -261,7 +261,7 @@ namespace OIC NSResult NSConsumerService::enableRemoteService(const std::string &serverAddress) { NS_LOG(DEBUG, "enableRemoteService - IN"); - NS_LOG_V(DEBUG, "Server Address : %s", serverAddress.c_str()); + NS_LOG_V(INFO_PRIVATE, "Server Address : %s", serverAddress.c_str()); NSResult result = NSResult::ERROR; #ifdef WITH_CLOUD result = (NSResult) NSConsumerEnableRemoteService(OICStrdup(serverAddress.c_str())); @@ -277,7 +277,7 @@ namespace OIC const std::string &topicName) { NS_LOG(DEBUG, "subscribeMQService - IN"); - NS_LOG_V(DEBUG, "Server Address : %s", serverAddress.c_str()); + NS_LOG_V(INFO_PRIVATE, "Server Address : %s", serverAddress.c_str()); NSResult result = NSResult::ERROR; #ifdef WITH_MQ result = (NSResult) NSConsumerSubscribeMQService( diff --git a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp index 4a78b4f..9272cf3 100755 --- a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp +++ b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp @@ -167,7 +167,7 @@ namespace OIC iter = iter->next; } } - NS_LOG_V(DEBUG, "calling Lower layer UpdateTopicList for Provider Id : %s", + NS_LOG_V(INFO_PRIVATE, "calling Lower layer UpdateTopicList for Provider Id : %s", getProviderId().c_str()); NSResult result = (NSResult) NSConsumerUpdateTopicList(getProviderId().c_str(), topicLL); diff --git a/service/notification/cpp-wrapper/provider/src/NSAcceptedConsumers.cpp b/service/notification/cpp-wrapper/provider/src/NSAcceptedConsumers.cpp index 0ad1840..241317a 100755 --- a/service/notification/cpp-wrapper/provider/src/NSAcceptedConsumers.cpp +++ b/service/notification/cpp-wrapper/provider/src/NSAcceptedConsumers.cpp @@ -45,7 +45,7 @@ namespace OIC void NSAcceptedConsumers::addConsumer(std::shared_ptr consumer) { std::lock_guard lock(m_mutex); - NS_LOG_V(DEBUG, "AcceptedConsumers::addConsumer Id : %s", consumer->getConsumerId().c_str()); + NS_LOG_V(INFO_PRIVATE, "AcceptedConsumers::addConsumer Id : %s", consumer->getConsumerId().c_str()); m_consumers[consumer->getConsumerId()] = consumer; return; } @@ -53,7 +53,7 @@ namespace OIC void NSAcceptedConsumers::removeConsumer(const std::string &id) { std::lock_guard lock(m_mutex); - NS_LOG_V(DEBUG, "AcceptedConsumers::removeConsumer Id : %s", id.c_str()); + NS_LOG_V(INFO_PRIVATE, "AcceptedConsumers::removeConsumer Id : %s", id.c_str()); m_consumers.erase(id); return; } @@ -61,7 +61,7 @@ namespace OIC bool NSAcceptedConsumers::isAccepted(const std::string &id) { std::lock_guard lock(m_mutex); - NS_LOG_V(DEBUG, "AcceptedConsumers::isAccepted Id : %s", id.c_str()); + NS_LOG_V(INFO_PRIVATE, "AcceptedConsumers::isAccepted Id : %s", id.c_str()); if ( m_consumers.find(id) == m_consumers.end() ) { NS_LOG(DEBUG, "isAccepted : Not Found Consumer with given ID"); diff --git a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp index 094c4e4..c6332cc 100755 --- a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp +++ b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp @@ -143,7 +143,7 @@ namespace OIC NSResult NSProviderService::enableRemoteService(const std::string &serverAddress) { NS_LOG(DEBUG, "enableRemoteService - IN"); - NS_LOG_V(DEBUG, "Server Address : %s", serverAddress.c_str()); + NS_LOG_V(INFO_PRIVATE, "Server Address : %s", serverAddress.c_str()); NSResult result = NSResult::ERROR; #ifdef WITH_CLOUD result = (NSResult) NSProviderEnableRemoteService(OICStrdup(serverAddress.c_str())); @@ -158,7 +158,7 @@ namespace OIC NSResult NSProviderService::disableRemoteService(const std::string &serverAddress) { NS_LOG(DEBUG, "disableRemoteService - IN"); - NS_LOG_V(DEBUG, "Server Address : %s", serverAddress.c_str()); + NS_LOG_V(INFO_PRIVATE, "Server Address : %s", serverAddress.c_str()); NSResult result = NSResult::ERROR; #ifdef WITH_CLOUD result = (NSResult) NSProviderDisableRemoteService(OICStrdup(serverAddress.c_str())); @@ -174,7 +174,7 @@ namespace OIC const std::string &topicName) { NS_LOG(DEBUG, "subscribeMQService - IN"); - NS_LOG_V(DEBUG, "Server Address : %s", serverAddress.c_str()); + NS_LOG_V(INFO_PRIVATE, "Server Address : %s", serverAddress.c_str()); NSResult result = NSResult::ERROR; #ifdef WITH_MQ result = (NSResult) NSProviderSubscribeMQService( @@ -195,7 +195,7 @@ namespace OIC ::NSMessage *nsMsg = getNSMessage(msg); - NS_LOG_V(DEBUG, "nsMsg->providerId : %s", nsMsg->providerId); + NS_LOG_V(INFO_PRIVATE, "nsMsg->providerId : %s", nsMsg->providerId); result = (NSResult) NSSendMessage(nsMsg); OICFree(nsMsg->dateTime); OICFree(nsMsg->title); @@ -234,7 +234,7 @@ namespace OIC NSMessage nsMessage(message); NS_LOG_V(DEBUG, "Message ID : %lld", (long long int) nsMessage.getMessageId()); - NS_LOG_V(DEBUG, "Provider ID : %s", nsMessage.getProviderId().c_str()); + NS_LOG_V(INFO_PRIVATE, "Provider ID : %s", nsMessage.getProviderId().c_str()); NS_LOG(DEBUG, "createMessage - OUT"); OICFree(message); diff --git a/service/notification/src/common/NSUtil.c b/service/notification/src/common/NSUtil.c index 6f46db8..c3dafff 100755 --- a/service/notification/src/common/NSUtil.c +++ b/service/notification/src/common/NSUtil.c @@ -298,7 +298,7 @@ NSSyncInfo * NSGetSyncInfo(OCPayload * payload) OICStrcpy(retSync->providerId, UUID_STRING_SIZE, providerId); OICFree(providerId); - NS_LOG_V(DEBUG, "Provider ID : %s", retSync->providerId); + NS_LOG_V(INFO_PRIVATE, "Provider ID : %s", retSync->providerId); NS_LOG_V(DEBUG, "Sync ID : %lld", (long long int)retSync->messageId); NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->state); @@ -595,9 +595,9 @@ OCDevAddr * NSChangeAddress(const char * inputaddress) retAddr->port = port; NS_LOG(DEBUG, "Change Address for TCP request"); - NS_LOG_V(DEBUG, "Origin : %s", inputaddress); - NS_LOG_V(DEBUG, "Changed Addr : %s", retAddr->addr); - NS_LOG_V(DEBUG, "Changed Port : %d", retAddr->port); + NS_LOG_V(INFO_PRIVATE, "Origin : %s", address); + NS_LOG_V(INFO_PRIVATE, "Changed Addr : %s", retAddr->addr); + NS_LOG_V(INFO_PRIVATE, "Changed Port : %d", retAddr->port); return retAddr; } diff --git a/service/notification/src/consumer/NSConsumerCommon.c b/service/notification/src/consumer/NSConsumerCommon.c index d169525..89dbdb8 100644 --- a/service/notification/src/consumer/NSConsumerCommon.c +++ b/service/notification/src/consumer/NSConsumerCommon.c @@ -346,7 +346,7 @@ NSMessage * NSGetMessage(OCRepPayload * payload) NS_LOG(DEBUG, "get provider id"); char * pId = NULL; getResult = OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_PROVIDER_ID, &pId); - NS_LOG_V (DEBUG, "provider id: %s", pId); + NS_LOG_V (INFO_PRIVATE, "provider id: %s", pId); NS_VERIFY_NOT_NULL(getResult == true ? (void *) 1 : NULL, NULL); NS_LOG(DEBUG, "create NSMessage"); diff --git a/service/notification/src/consumer/NSConsumerCommunication.c b/service/notification/src/consumer/NSConsumerCommunication.c index 3c756f6..0d74c56 100644 --- a/service/notification/src/consumer/NSConsumerCommunication.c +++ b/service/notification/src/consumer/NSConsumerCommunication.c @@ -86,7 +86,7 @@ NSResult NSConsumerSubscribeProvider(NSProvider * provider) } } - NS_LOG_V(DEBUG, "subscribe to %s:%d", connections->addr->addr, connections->addr->port); + NS_LOG_V(INFO_PRIVATE, "subscribe to %s:%d", connections->addr->addr, connections->addr->port); NS_LOG(DEBUG, "get subscribe message query"); char * query = NULL; @@ -250,7 +250,7 @@ NSSyncInfo * NSGetSyncInfoc(OCClientResponse * clientResponse) NS_LOG_V(DEBUG, "Sync ID : %lld", (long long int)retSync->messageId); NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->state); - NS_LOG_V(DEBUG, "Sync Provider ID : %s", retSync->providerId); + NS_LOG_V(INFO_PRIVATE, "Sync Provider ID : %s", retSync->providerId); return retSync; } @@ -364,12 +364,12 @@ void NSConsumerCommunicationTaskProcessing(NSTask * task) { if (connections->isSubscribing == false) { - NS_LOG_V(DEBUG, "unsubscribed to %s:%d", + NS_LOG_V(INFO_PRIVATE, "unsubscribed to %s:%d", connections->addr->addr, connections->addr->port); connections = connections->next; continue; } - NS_LOG_V(DEBUG, "cancel subscribe to %s:%d", + NS_LOG_V(INFO_PRIVATE, "cancel subscribe to %s:%d", connections->addr->addr, connections->addr->port); OCCancel(connections->messageHandle, NS_QOS, NULL, 0); OCCancel(connections->syncHandle, NS_QOS, NULL, 0); @@ -474,7 +474,7 @@ void NSConsumerCommunicationTaskProcessing(NSTask * task) } OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_CONSUMER_ID, *NSGetConsumerId()); - NS_LOG_V(DEBUG, "NS_ATTRIBUTE_CONSUMER_ID: %s", *NSGetConsumerId()); + NS_LOG_V(INFO_PRIVATE, "NS_ATTRIBUTE_CONSUMER_ID: %s", *NSGetConsumerId()); iter = topicLL; int iterSize = 0; @@ -654,7 +654,7 @@ OCStackApplicationResult NSIntrospectTopic( NS_VERIFY_STACK_SUCCESS(NSOCResultToSuccess(clientResponse->result), OC_STACK_KEEP_TRANSACTION) - NS_LOG_V(DEBUG, "GET response income : %s:%d", + NS_LOG_V(INFO_PRIVATE, "GET response income : %s:%d", clientResponse->devAddr.addr, clientResponse->devAddr.port); NS_LOG_V(DEBUG, "GET response result : %d", clientResponse->result); diff --git a/service/notification/src/consumer/NSConsumerDiscovery.c b/service/notification/src/consumer/NSConsumerDiscovery.c index 7124bff..28c137e 100644 --- a/service/notification/src/consumer/NSConsumerDiscovery.c +++ b/service/notification/src/consumer/NSConsumerDiscovery.c @@ -43,7 +43,7 @@ OCStackApplicationResult NSConsumerPresenceListener( NS_VERIFY_STACK_SUCCESS( NSOCResultToSuccess(clientResponse->result), OC_STACK_KEEP_TRANSACTION); - NS_LOG_V(DEBUG, "Presence income : %s:%d", + NS_LOG_V(INFO_PRIVATE, "Presence income : %s:%d", clientResponse->devAddr.addr, clientResponse->devAddr.port); NS_LOG_V(DEBUG, "Presence result : %d", clientResponse->result); @@ -93,7 +93,7 @@ OCStackApplicationResult NSProviderDiscoverListener( NS_VERIFY_NOT_NULL(clientResponse->payload, OC_STACK_KEEP_TRANSACTION); NS_VERIFY_STACK_SUCCESS(NSOCResultToSuccess(clientResponse->result), OC_STACK_KEEP_TRANSACTION); - NS_LOG_V(DEBUG, "Discover income : %s:%d", + NS_LOG_V(INFO_PRIVATE, "Discover income : %s:%d", clientResponse->devAddr.addr, clientResponse->devAddr.port); NS_LOG_V(DEBUG, "Discover result : %d", clientResponse->result); @@ -152,7 +152,7 @@ OCStackApplicationResult NSIntrospectProvider( NS_VERIFY_NOT_NULL(clientResponse, OC_STACK_KEEP_TRANSACTION); NS_VERIFY_STACK_SUCCESS(NSOCResultToSuccess(clientResponse->result), OC_STACK_KEEP_TRANSACTION); - NS_LOG_V(DEBUG, "GET response income : %s:%d", + NS_LOG_V(INFO_PRIVATE, "GET response income : %s:%d", clientResponse->devAddr.addr, clientResponse->devAddr.port); NS_LOG_V(DEBUG, "GET response result : %d", clientResponse->result); @@ -210,7 +210,7 @@ void NSConsumerHandleRequestDiscover(OCDevAddr * address, NSConsumerDiscoverType } else { - NS_LOG_V(DEBUG, "Request discover But Adapter is not IP : %d", address->adapter); + NS_LOG_V(INFO_PRIVATE, "Request discover But Adapter is not IP : %d", address->adapter); } } else diff --git a/service/notification/src/consumer/NSConsumerInterface.c b/service/notification/src/consumer/NSConsumerInterface.c index 6101708..8bd7a99 100644 --- a/service/notification/src/consumer/NSConsumerInterface.c +++ b/service/notification/src/consumer/NSConsumerInterface.c @@ -204,7 +204,7 @@ NSTopicLL * NSConsumerGetTopicList(const char * providerId) bool isStartedConsumer = NSIsStartedConsumer(); NS_VERIFY_NOT_NULL(isStartedConsumer == true ? (void *) 1 : NULL, NULL); - NS_LOG_V(DEBUG, "NSProvider ID: %s", providerId); + NS_LOG_V(INFO_PRIVATE, "NSProvider ID: %s", providerId); NSProvider_internal * prov_internal = NSConsumerFindNSProvider(providerId); NS_VERIFY_NOT_NULL(prov_internal, NULL); diff --git a/service/notification/src/consumer/NSConsumerInternalTaskController.c b/service/notification/src/consumer/NSConsumerInternalTaskController.c index 3156979..40a4192 100644 --- a/service/notification/src/consumer/NSConsumerInternalTaskController.c +++ b/service/notification/src/consumer/NSConsumerInternalTaskController.c @@ -235,7 +235,7 @@ void NSConsumerHandleProviderDiscovered(NSProvider_internal * provider) isSubscribing |= infos->isSubscribing; if (infos->addr->adapter == newAdapter && infos->isSubscribing == true) { - NS_LOG_V(DEBUG, "This provider already discovered : %s:%d", + NS_LOG_V(INFO_PRIVATE, "This provider already discovered : %s:%d", infos->addr->addr, infos->addr->port); NS_LOG_V(DEBUG, "Subscription : %d", infos->isSubscribing); return; @@ -289,7 +289,7 @@ void NSConsumerHandleProviderDeleted(NSProvider_internal * provider) NSResult ret = NSConsumerStorageDelete(providerCache, provider->providerId); NS_VERIFY_NOT_NULL_V(ret == NS_OK ? (void *)1 : NULL); - NS_LOG_V(DEBUG, "Stopped Provider : %s", provider->providerId); + NS_LOG_V(INFO_PRIVATE, "Stopped Provider : %s", provider->providerId); NSProvider * prov = NSCopyProvider(provider); NSProviderChanged(prov, NS_STOPPED); NSRemoveProvider(prov); @@ -323,7 +323,7 @@ void NSConsumerHandleRecvProviderChanged(NSMessage * msg) { NS_VERIFY_NOT_NULL_V(msg); - NS_LOG_V(DEBUG, "confirmed by : %s", msg->providerId); + NS_LOG_V(INFO_PRIVATE, "confirmed by : %s", msg->providerId); NSCacheList * ProviderCache = *(NSGetProviderCacheList()); diff --git a/service/notification/src/consumer/NSConsumerMQPlugin.c b/service/notification/src/consumer/NSConsumerMQPlugin.c index 96a264e..b59fc46 100644 --- a/service/notification/src/consumer/NSConsumerMQPlugin.c +++ b/service/notification/src/consumer/NSConsumerMQPlugin.c @@ -104,7 +104,7 @@ OCStackApplicationResult NSConsumerIntrospectMQTopic( NS_VERIFY_NOT_NULL(clientResponse->payload, OC_STACK_KEEP_TRANSACTION); NS_LOG(DEBUG, "income get response of MQ broker"); - NS_LOG_V(DEBUG, "MQ GET response income : %s:%d", + NS_LOG_V(INFO_PRIVATE, "MQ GET response income : %s:%d", clientResponse->devAddr.addr, clientResponse->devAddr.port); NS_LOG_V(DEBUG, "MQ GET response result : %d", clientResponse->result); @@ -160,7 +160,7 @@ OCStackApplicationResult NSConsumerMQListener( NS_VERIFY_NOT_NULL(clientResponse->payload, OC_STACK_KEEP_TRANSACTION); NS_LOG(DEBUG, "income observe response of MQ notification"); - NS_LOG_V(DEBUG, "MQ OBS response income : %s:%d", + NS_LOG_V(INFO_PRIVATE, "MQ OBS response income : %s:%d", clientResponse->devAddr.addr, clientResponse->devAddr.port); NS_LOG_V(DEBUG, "MQ OBS response result : %d", clientResponse->result); diff --git a/service/notification/src/consumer/NSConsumerMemoryCache.c b/service/notification/src/consumer/NSConsumerMemoryCache.c index 66a5547..366ef8c 100644 --- a/service/notification/src/consumer/NSConsumerMemoryCache.c +++ b/service/notification/src/consumer/NSConsumerMemoryCache.c @@ -242,7 +242,7 @@ NSResult NSConsumerCacheWriteProvider(NSCacheList * list, NSCacheElement * newOb NSCacheElement * obj = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement)); NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(obj, NS_ERROR, pthread_mutex_unlock(mutex)); - NS_LOG_V(DEBUG, "New Object address : %s:%d", newProvObj->connection->addr->addr, newProvObj->connection->addr->port); + NS_LOG_V(INFO_PRIVATE, "New Object address : %s:%d", newProvObj->connection->addr->addr, newProvObj->connection->addr->port); obj->data = (void *) NSCopyProvider_internal(newProvObj); if (!obj->data) diff --git a/service/notification/src/consumer/NSConsumerNetworkEventListener.c b/service/notification/src/consumer/NSConsumerNetworkEventListener.c index 5dc56ca..d48d897 100644 --- a/service/notification/src/consumer/NSConsumerNetworkEventListener.c +++ b/service/notification/src/consumer/NSConsumerNetworkEventListener.c @@ -80,7 +80,7 @@ void NSConnectionStateListener(const CAEndpoint_t * info, bool connected) NS_VERIFY_NOT_NULL_V(info); NS_LOG_V(DEBUG, "adapter : %d", info->adapter); - NS_LOG_V(DEBUG, "remote_address : %s:%d", info->addr, info->port); + NS_LOG_V(INFO_PRIVATE, "remote_address : %s:%d", info->addr, info->port); NS_LOG_V(DEBUG, "isConnect : %d", connected); NSTaskType type = TASK_EVENT_CONNECTED; diff --git a/service/notification/src/consumer/NSConsumerScheduler.c b/service/notification/src/consumer/NSConsumerScheduler.c index 89c6a76..b5fd6b9 100644 --- a/service/notification/src/consumer/NSConsumerScheduler.c +++ b/service/notification/src/consumer/NSConsumerScheduler.c @@ -82,7 +82,7 @@ NSResult NSConsumerMessageHandlerInit() NS_VERIFY_NOT_NULL(consumerUuid, NS_ERROR); NSSetConsumerId(consumerUuid); - NS_LOG_V(DEBUG, "Consumer ID : %s", *NSGetConsumerId()); + NS_LOG_V(INFO_PRIVATE, "Consumer ID : %s", *NSGetConsumerId()); NS_LOG(DEBUG, "listener init"); NSResult ret = NSConsumerListenerInit(); diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c index 116a5f1..73f3c95 100644 --- a/service/notification/src/provider/NSProviderInterface.c +++ b/service/notification/src/provider/NSProviderInterface.c @@ -155,7 +155,7 @@ NSResult NSProviderEnableRemoteService(char *serverAddress) return NS_FAIL; } - NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress); + NS_LOG_V(INFO_PRIVATE, "Remote server address: %s", serverAddress); NS_LOG(DEBUG, "Request to publish resource"); NSPushQueue(DISCOVERY_SCHEDULER, TASK_PUBLISH_RESOURCE, serverAddress); @@ -165,7 +165,7 @@ NSResult NSProviderEnableRemoteService(char *serverAddress) #else (void) serverAddress; #endif - NS_LOG_V(DEBUG, "Not logged in remote server: %s", serverAddress); + NS_LOG_V(INFO_PRIVATE, "Not logged in remote server: %s", serverAddress); return NS_FAIL; } @@ -182,7 +182,7 @@ NSResult NSProviderDisableRemoteService(char *serverAddress) return NS_FAIL; } - NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress); + NS_LOG_V(INFO_PRIVATE, "Remote server address: %s", serverAddress); NS_LOG(DEBUG, "Delete remote server info"); NSDeleteRemoteServerAddress(serverAddress); @@ -193,7 +193,7 @@ NSResult NSProviderDisableRemoteService(char *serverAddress) #else (void) serverAddress; #endif - NS_LOG_V(DEBUG, "Not logged in remote server : %s", serverAddress); + NS_LOG_V(INFO_PRIVATE, "Not logged in remote server : %s", serverAddress); return NS_FAIL; } diff --git a/service/notification/src/provider/NSProviderListener.c b/service/notification/src/provider/NSProviderListener.c index 5f29661..7c7faef 100644 --- a/service/notification/src/provider/NSProviderListener.c +++ b/service/notification/src/provider/NSProviderListener.c @@ -291,7 +291,7 @@ OCEntityHandlerResult NSEntityHandlerTopicCb(OCEntityHandlerFlag flag, else if (OC_REST_POST == entityHandlerRequest->method) { // Receive interesting topic list from consumers - // Send topic notice message(id = TOPIC) to the consumer + // Send topic notice message(id = TOPIC) to the consumer // which requests to post. NS_LOG(DEBUG, "NSEntityHandlerTopicCb - OC_REST_POST"); // Accepter is provider. our service is not support sendtopiclist from OC_REST_POST @@ -340,7 +340,7 @@ OCStackApplicationResult NSProviderMQListener(void * ctx, OCDoHandle handle, NS_VERIFY_NOT_NULL(clientResponse->payload, OC_STACK_KEEP_TRANSACTION); NS_LOG(DEBUG, "income observe response of MQ notification"); - NS_LOG_V(DEBUG, "MQ OBS response income : %s:%d", + NS_LOG_V(INFO_PRIVATE, "MQ OBS response income : %s:%d", clientResponse->devAddr.addr, clientResponse->devAddr.port); NS_LOG_V(DEBUG, "MQ OBS response result : %d", clientResponse->result); @@ -362,7 +362,7 @@ OCStackApplicationResult NSProviderMQListener(void * ctx, OCDoHandle handle, { char * pId = NULL; getResult = OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_PROVIDER_ID, &pId); - NS_LOG_V (DEBUG, "provider id: %s", pId); + NS_LOG_V (INFO_PRIVATE, "provider id: %s", pId); if (getResult && strcmp(pId, NSGetProviderInfo()->providerId) == 0) { @@ -389,7 +389,7 @@ OCStackApplicationResult NSProviderGetMQResponseCB(void * ctx, OCDoHandle handle NS_VERIFY_NOT_NULL(clientResponse->payload, OC_STACK_KEEP_TRANSACTION); NS_LOG(DEBUG, "income get response of MQ broker"); - NS_LOG_V(DEBUG, "MQ GET response income : %s:%d", + NS_LOG_V(INFO_PRIVATE, "MQ GET response income : %s:%d", clientResponse->devAddr.addr, clientResponse->devAddr.port); NS_LOG_V(DEBUG, "MQ GET response result : %d", clientResponse->result); @@ -493,7 +493,7 @@ void NSProviderConnectionStateListener(const CAEndpoint_t * info, bool connected if (info->adapter == CA_ADAPTER_TCP) { - NS_LOG_V(DEBUG, "TCP Connected remote address: %s:%d", info->addr, info->port); + NS_LOG_V(INFO_PRIVATE, "TCP Connected remote address: %s:%d", info->addr, info->port); } } else @@ -505,7 +505,7 @@ void NSProviderConnectionStateListener(const CAEndpoint_t * info, bool connected if (info->adapter == CA_ADAPTER_TCP) { - NS_LOG_V(DEBUG, "TCP Disconnected remote address: %s:%d", info->addr, info->port); + NS_LOG_V(INFO_PRIVATE, "TCP Disconnected remote address: %s:%d", info->addr, info->port); } } diff --git a/service/notification/src/provider/NSProviderMemoryCache.c b/service/notification/src/provider/NSProviderMemoryCache.c index de28f24..36e35c0 100644 --- a/service/notification/src/provider/NSProviderMemoryCache.c +++ b/service/notification/src/provider/NSProviderMemoryCache.c @@ -63,7 +63,7 @@ NSCacheElement * NSProviderStorageRead(NSCacheList * list, const char * findId) NSCacheElement * next = NULL; NSCacheType type = list->cacheType; - NS_LOG_V(DEBUG, "Find ID - %s", findId); + NS_LOG_V(INFO_PRIVATE, "Find ID - %s", findId); while (iter) { @@ -108,7 +108,7 @@ NSResult NSCacheUpdateSubScriptionState(NSCacheList * list, char * id, bool stat { NS_LOG(DEBUG, "Update Data - IN"); - NS_LOG_V(DEBUG, "currData_ID = %s", itData->id); + NS_LOG_V(INFO_PRIVATE, "currData_ID = %s", itData->id); NS_LOG_V(DEBUG, "currData_MsgObID = %d", itData->messageObId); NS_LOG_V(DEBUG, "currData_SyncObID = %d", itData->syncObId); NS_LOG_V(DEBUG, "currData_Cloud_MsgObID = %d", itData->remote_messageObId); @@ -164,14 +164,14 @@ NSResult NSProviderStorageWrite(NSCacheList * list, NSCacheElement * newObj) { NS_LOG(DEBUG, "Update Data - IN"); - NS_LOG_V(DEBUG, "currData_ID = %s", itData->id); + NS_LOG_V(INFO_PRIVATE, "currData_ID = %s", itData->id); NS_LOG_V(DEBUG, "currData_MsgObID = %d", itData->messageObId); NS_LOG_V(DEBUG, "currData_SyncObID = %d", itData->syncObId); NS_LOG_V(DEBUG, "currData_Cloud_MsgObID = %d", itData->remote_messageObId); NS_LOG_V(DEBUG, "currData_Cloud_SyncObID = %d", itData->remote_syncObId); NS_LOG_V(DEBUG, "currData_IsWhite = %d", itData->isWhite); - NS_LOG_V(DEBUG, "subData_ID = %s", subData->id); + NS_LOG_V(INFO_PRIVATE, "subData_ID = %s", subData->id); NS_LOG_V(DEBUG, "subData_MsgObID = %d", subData->messageObId); NS_LOG_V(DEBUG, "subData_SyncObID = %d", subData->syncObId); NS_LOG_V(DEBUG, "subData_Cloud_MsgObID = %d", subData->remote_messageObId); @@ -288,13 +288,13 @@ bool NSProviderCompareIdCacheData(NSCacheType type, void * data, const char * id return false; } - NS_LOG_V(DEBUG, "Data(compData) = [%s]", id); + NS_LOG_V(INFO_PRIVATE, "Data(compData) = [%s]", id); if (type == NS_PROVIDER_CACHE_SUBSCRIBER) { NSCacheSubData * subData = (NSCacheSubData *) data; - NS_LOG_V(DEBUG, "Data(subData) = [%s]", subData->id); + NS_LOG_V(INFO_PRIVATE, "Data(subData) = [%s]", subData->id); if (strcmp(subData->id, id) == 0) { @@ -309,7 +309,7 @@ bool NSProviderCompareIdCacheData(NSCacheType type, void * data, const char * id { NSCacheSubData * subData = (NSCacheSubData *) data; - NS_LOG_V(DEBUG, "Data(subData) = [%s]", subData->id); + NS_LOG_V(INFO_PRIVATE, "Data(subData) = [%s]", subData->id); OCObservationId currID = *id; @@ -356,7 +356,7 @@ bool NSProviderCompareIdCacheData(NSCacheType type, void * data, const char * id { NSCacheTopicSubData * topicData = (NSCacheTopicSubData *) data; - NS_LOG_V(DEBUG, "Data(topicData) = [%s]", topicData->id); + NS_LOG_V(INFO_PRIVATE, "Data(topicData) = [%s]", topicData->id); if (strcmp(topicData->id, id) == 0) { @@ -541,7 +541,7 @@ NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList, if (curr && strcmp(curr->id, consumerId) == 0) { - NS_LOG_V(DEBUG, "curr->id = %s", curr->id); + NS_LOG_V(INFO_PRIVATE, "curr->id = %s", curr->id); NS_LOG_V(DEBUG, "curr->topicName = %s", curr->topicName); NSTopicLL * topicIter = topics; @@ -623,9 +623,9 @@ NSResult NSProviderDeleteConsumerTopic(NSCacheList * conTopicList, } NSCacheTopicSubData * curr = (NSCacheTopicSubData *) del->data; - NS_LOG_V(DEBUG, "compareid = %s", cId); + NS_LOG_V(INFO_PRIVATE, "compareid = %s", cId); NS_LOG_V(DEBUG, "comparetopicName = %s", topicName); - NS_LOG_V(DEBUG, "curr->id = %s", curr->id); + NS_LOG_V(INFO_PRIVATE, "curr->id = %s", curr->id); NS_LOG_V(DEBUG, "curr->topicName = %s", curr->topicName); if ( (strncmp(curr->id, cId, NS_UUID_STRING_SIZE) == 0) && diff --git a/service/notification/src/provider/NSProviderNotification.c b/service/notification/src/provider/NSProviderNotification.c index d27c3be..300ef1d 100644 --- a/service/notification/src/provider/NSProviderNotification.c +++ b/service/notification/src/provider/NSProviderNotification.c @@ -145,7 +145,7 @@ NSResult NSSendNotification(NSMessage *msg) while (it) { NSCacheSubData * subData = (NSCacheSubData *) it->data; - NS_LOG_V(DEBUG, "message subData->id = %s", subData->id); + NS_LOG_V(INFO_PRIVATE, "message subData->id = %s", subData->id); NS_LOG_V(DEBUG, "subData->messageId = %d", subData->messageObId); NS_LOG_V(DEBUG, "subData->cloud_messageId = %d", subData->remote_messageObId); NS_LOG_V(DEBUG, "subData->syncId = %d", subData->syncObId); @@ -248,7 +248,7 @@ NSResult NSSendSync(NSSyncInfo *sync) while (it) { NSCacheSubData * subData = (NSCacheSubData *) it->data; - NS_LOG_V(DEBUG, "sync subData->id = %s", subData->id); + NS_LOG_V(INFO_PRIVATE, "sync subData->id = %s", subData->id); NS_LOG_V(DEBUG, "subData->messageId = %d", subData->messageObId); NS_LOG_V(DEBUG, "subData->cloud_messageId = %d", subData->remote_messageObId); NS_LOG_V(DEBUG, "subData->syncId = %d", subData->syncObId); diff --git a/service/notification/src/provider/NSProviderResource.c b/service/notification/src/provider/NSProviderResource.c index 686ae33..c4d2b58 100644 --- a/service/notification/src/provider/NSProviderResource.c +++ b/service/notification/src/provider/NSProviderResource.c @@ -37,7 +37,7 @@ OCStackApplicationResult NSHandlePublishCb(void *ctx, OCDoHandle handle, if (ctx != (void *)DEFAULT_CONTEXT_VALUE) { NS_LOG(DEBUG, "Invalid Publish callback received"); - } + } NS_LOG_V(DEBUG, "Publish resource response received code: %d", clientResponse->result); @@ -48,7 +48,7 @@ NSResult NSPublishResourceToCloud(char *serverAddress) { NS_LOG(DEBUG, "NSPublishResourceToCloud - IN"); - NS_LOG_V(DEBUG, "Remote Server Address: %s", serverAddress); + NS_LOG_V(INFO_PRIVATE, "Remote Server Address: %s", serverAddress); OCCallbackData cbData; cbData.cb = NSHandlePublishCb; diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c index 0dbcf20..52ad96d 100644 --- a/service/notification/src/provider/NSProviderSubscription.c +++ b/service/notification/src/provider/NSProviderSubscription.c @@ -79,7 +79,7 @@ NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest return NS_ERROR; } - NS_LOG_V(DEBUG, "NS Provider ID: %s", NSGetProviderInfo()->providerId); + NS_LOG_V(INFO_PRIVATE, "NS Provider ID: %s", NSGetProviderInfo()->providerId); char * copyReq = OICStrdup(entityHandlerRequest->query); char * reqInterface = NSGetValueFromQuery(copyReq, NS_QUERY_INTERFACE); @@ -135,7 +135,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour return; } - NS_LOG_V(DEBUG, "consumerId = %s", id); + NS_LOG_V(INFO_PRIVATE, "consumerId = %s", id); if (resourceType == NS_RESOURCE_MESSAGE) { NS_LOG(DEBUG, "resourceType == NS_RESOURCE_MESSAGE"); @@ -145,9 +145,9 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour NS_VERIFY_NOT_NULL_V(subData); OICStrcpy(subData->id, UUID_STRING_SIZE, id); - NS_LOG_V(DEBUG, "SubList ID = [%s]", subData->id); + NS_LOG_V(INFO_PRIVATE, "SubList ID = [%s]", subData->id); - NS_LOG_V(DEBUG, "Consumer Address: %s", entityHandlerRequest->devAddr.addr); + NS_LOG_V(INFO_PRIVATE, "Consumer Address: %s", entityHandlerRequest->devAddr.addr); subData->remote_messageObId = subData->messageObId = 0; @@ -206,9 +206,9 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour NS_VERIFY_NOT_NULL_V(subData); OICStrcpy(subData->id, UUID_STRING_SIZE, id); - NS_LOG_V(DEBUG, "SubList ID = [%s]", subData->id); + NS_LOG_V(INFO_PRIVATE, "SubList ID = [%s]", subData->id); - NS_LOG_V(DEBUG, "Consumer Address: %s", entityHandlerRequest->devAddr.addr); + NS_LOG_V(INFO_PRIVATE, "Consumer Address: %s", entityHandlerRequest->devAddr.addr); subData->remote_syncObId = subData->syncObId = 0; bool isRemoteServer = false; diff --git a/service/notification/src/provider/NSProviderSystem.c b/service/notification/src/provider/NSProviderSystem.c index 8e488e9..a140367 100644 --- a/service/notification/src/provider/NSProviderSystem.c +++ b/service/notification/src/provider/NSProviderSystem.c @@ -57,14 +57,14 @@ void NSSetRemoteServerAddress(char *serverAddress) void NSDeleteRemoteServerAddress(char *serverAddress) { - NS_LOG_V(DEBUG, "Delete cloud address: %s", serverAddress); + NS_LOG_V(INFO_PRIVATE, "Delete cloud address: %s", serverAddress); memset(NSRemoteServerAddress, 0, MAX_SERVER_ADDRESS); } bool NSIsRemoteServerAddress(char *serverAddress) { - NS_LOG_V(DEBUG, "Check server address: %s", serverAddress); + NS_LOG_V(INFO_PRIVATE, "Check server address: %s", serverAddress); if (serverAddress != NULL) { @@ -81,7 +81,7 @@ void NSInitProviderInfo(const char * userInfo) providerInfo = (NSProviderInfo *) OICMalloc(sizeof(NSProviderInfo)); const char * generatedUuid = (char *)OCGetServerInstanceIDString(); - NS_LOG_V(DEBUG, "Generate Provider ID: %s", generatedUuid); + NS_LOG_V(INFO_PRIVATE, "Generate Provider ID: %s", generatedUuid); OICStrcpy(providerInfo->providerId, UUID_STRING_SIZE, generatedUuid); providerInfo->providerName = NULL; @@ -121,7 +121,7 @@ void NSDeinitProviderInfo() NSProviderInfo * NSGetProviderInfo() { - NS_LOG_V(DEBUG, "ProviderInfo: %s", providerInfo->providerId); + NS_LOG_V(INFO_PRIVATE, "ProviderInfo: %s", providerInfo->providerId); return providerInfo; } diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c index 2ad62f7..3057dda 100644 --- a/service/notification/src/provider/NSProviderTopic.c +++ b/service/notification/src/provider/NSProviderTopic.c @@ -374,7 +374,7 @@ NSResult NSPostConsumerTopics(OCEntityHandlerRequest * entityHandlerRequest) return NS_FAIL; } - NS_LOG_V(DEBUG, "TOPIC consumer ID = %s", consumerId); + NS_LOG_V(INFO_PRIVATE, "TOPIC consumer ID = %s", consumerId); consumerTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID;