Add more descriptive log messages in easy setup

[platform/upstream/iotivity.git] / service / easy-setup / mediator / richsdk / src / RemoteEnrollee.cpp

diff --git a/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp b/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
index 58661d0..00c5df7 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
+++ b/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
@@ -56,79 +56,73 @@ namespace OIC
         void RemoteEnrollee::securityStatusHandler(
                 const std::shared_ptr< SecProvisioningStatus > status) const
         {
-            OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG, "easySetupStatusCallback status is, UUID = %s,"
-                    "Status = %d", status->getDeviceUUID().c_str(),
-                    status->getESResult());
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "securityStatusHandlr IN");
+            OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG, "UUID = %s, ESResult = %d",
+                    status->getDeviceUUID().c_str(), status->getESResult());
 
             if(status->getESResult() == ES_OK)
             {
-                OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "Ownership and ACL are successful. "
-                        "Continue with Network information provisioning");
-
-                OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Before provisionProperties");
-
+                OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "Ownership transfer is successfully done.");
                 m_securityProvStatusCb(status);
             }
             else
             {
-                OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "Ownership and ACL are fail");
-
+                OIC_LOG(ERROR, ES_REMOTE_ENROLLEE_TAG, "Ownership transfer is failed.");
                 m_securityProvStatusCb(status);
             }
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "securityStatusHandlr OUT");
         }
 
         void RemoteEnrollee::getStatusHandler(
                 const std::shared_ptr< GetEnrolleeStatus > status) const
         {
-            OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Entering getStatusHandler");
-
-            OIC_LOG_V(DEBUG,ES_REMOTE_ENROLLEE_TAG,"getStatusHandler = %d", status->getESResult());
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "getStatusHandler IN");
 
+            OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG, "getStatusHandler = %d",
+                                                    status->getESResult());
             m_getStatusCb(status);
+
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "getStatusHandler OUT");
         }
 
         void RemoteEnrollee::getConfigurationStatusHandler (
                 const std::shared_ptr< GetConfigurationStatus > status) const
         {
-            OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Entering getConfigurationStatusHandler");
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "getConfigurationStatusHandler IN");
 
-            OIC_LOG_V(DEBUG,ES_REMOTE_ENROLLEE_TAG,"GetConfigurationStatus = %d",
+            OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG,"GetConfigurationStatus = %d",
                                                     status->getESResult());
-
             m_getConfigurationStatusCb(status);
+
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "getConfigurationStatusHandler OUT");
         }
 
         void RemoteEnrollee::devicePropProvisioningStatusHandler(
                 const std::shared_ptr< DevicePropProvisioningStatus > status) const
         {
-            OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Entering DevicePropProvisioningStatusHandler");
-
-            OIC_LOG_V(DEBUG,ES_REMOTE_ENROLLEE_TAG,"ProvStatus = %d", status->getESResult());
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "devicePropProvisioningStatusHandler IN");
 
+            OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG, "ProvStatus = %d", status->getESResult());
             m_devicePropProvStatusCb(status);
 
-            return;
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "devicePropProvisioningStatusHandler OUT");
         }
 
         void RemoteEnrollee::cloudPropProvisioningStatusHandler (
                 const std::shared_ptr< CloudPropProvisioningStatus > status) const
         {
-            OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Entering cloudPropProvisioningStatusHandler");
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "cloudPropProvisioningStatusHandler IN");
 
             OIC_LOG_V(DEBUG,ES_REMOTE_ENROLLEE_TAG,"CloudProvStatus = %d",
                                                     status->getESResult());
-
             m_cloudPropProvStatusCb(status);
-            return;
+
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "cloudPropProvisioningStatusHandler OUT");
         }
 
         void RemoteEnrollee::onDeviceDiscovered(std::shared_ptr<OC::OCResource> resource)
         {
-            OIC_LOG (DEBUG, ES_REMOTE_ENROLLEE_TAG, "onDeviceDiscovered");
-
-            std::string resourceURI;
-            std::string hostAddress;
-            std::string hostDeviceID;
+            OIC_LOG (DEBUG, ES_REMOTE_ENROLLEE_TAG, "onDeviceDiscovered IN");
 
             try
             {
@@ -136,6 +130,10 @@ namespace OIC
                 {
                     if(!(resource->connectivityType() & CT_ADAPTER_TCP))
                     {
+                        std::string resourceURI;
+                        std::string hostAddress;
+                        std::string hostDeviceID;
+
                         // Get the resource URI
                         resourceURI = resource->uri();
                         OIC_LOG_V (DEBUG, ES_REMOTE_ENROLLEE_TAG,
@@ -152,7 +150,7 @@ namespace OIC
 
                         if(!m_deviceId.empty() && m_deviceId == hostDeviceID)
                         {
-                            OIC_LOG (DEBUG, ES_REMOTE_ENROLLEE_TAG, "Find matched CloudResource");
+                            OIC_LOG (DEBUG, ES_REMOTE_ENROLLEE_TAG, "Find matched resource for cloud provisioning");
                             m_ocResource = resource;
                             m_discoveryResponse = true;
                             m_cond.notify_all();
@@ -165,11 +163,13 @@ namespace OIC
                 OIC_LOG_V (DEBUG, ES_REMOTE_ENROLLEE_TAG,
                         "Exception in foundResource: %s", e.what());
             }
+
+            OIC_LOG (DEBUG, ES_REMOTE_ENROLLEE_TAG, "onDeviceDiscovered OUT");
         }
 
         ESResult RemoteEnrollee::discoverResource()
         {
-            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "Enter discoverResource");
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "discoverResource IN");
 
             std::string query("");
             query.append(ES_BASE_RES_URI);
@@ -202,11 +202,13 @@ namespace OIC
                         "Failed discoverResource because timeout");
                 return ES_ERROR;
             }
+
             return ES_OK;
         }
 
         void RemoteEnrollee::provisionSecurity(const SecurityProvStatusCb callback)
         {
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "provisionSecurity IN");
 #ifdef __WITH_DTLS__
             ESResult res = ESResult::ES_ERROR;
             if(!callback)
@@ -232,7 +234,8 @@ namespace OIC
             m_securityProvStatusCb(securityProvisioningStatus);
             m_enrolleeSecurity.reset();
 #else
-            OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Mediator is unsecured.");
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG,"Mediator is unsecured built.");
+
             if(!callback)
             {
                 throw ESInvalidParameterException("Callback is empty");
@@ -242,10 +245,13 @@ namespace OIC
                                    ("", ESResult::ES_SEC_OPERATION_IS_NOT_SUPPORTED);
             callback(securityProvisioningStatus);
 #endif
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "provisionSecurity OUT");
         }
 
         void RemoteEnrollee::getStatus(const GetStatusCb callback)
         {
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "getStatus IN");
+
             if(!callback)
             {
                 throw ESInvalidParameterException("Callback is empty");
@@ -263,10 +269,13 @@ namespace OIC
             m_enrolleeResource->registerGetStatusCallback(getStatusCb);
             m_enrolleeResource->getStatus();
 
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "getStatus OUT");
         }
 
         void RemoteEnrollee::getConfiguration(const GetConfigurationStatusCb callback)
         {
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "getConfiguration IN");
+
             if(!callback)
             {
                 throw ESInvalidParameterException("Callback is empty");
@@ -283,12 +292,14 @@ namespace OIC
                     &RemoteEnrollee::getConfigurationStatusHandler, this, std::placeholders::_1);
             m_enrolleeResource->registerGetConfigurationStatusCallback(getConfigurationStatusCb);
             m_enrolleeResource->getConfiguration();
+
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "getConfiguration OUT");
         }
 
         void RemoteEnrollee::provisionDeviceProperties(const DeviceProp& deviceProp,
                                                             const DevicePropProvStatusCb callback)
         {
-            OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Enter provisionDeviceProperties");
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "provisionDeviceProperties IN");
 
             if(!callback)
             {
@@ -313,10 +324,14 @@ namespace OIC
 
             m_enrolleeResource->registerDevicePropProvStatusCallback(devicePropProvStatusCb);
             m_enrolleeResource->provisionProperties(deviceProp);
+
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "provisionDeviceProperties OUT");
         }
 
         void RemoteEnrollee::initCloudResource()
         {
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "initCloudResource IN");
+
             ESResult result = ES_ERROR;
 
             result = discoverResource();
@@ -339,12 +354,14 @@ namespace OIC
                     throw ESBadGetException ("Resource handle is invalid");
                 }
             }
+
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "initCloudResource OUT");
         }
 
         void RemoteEnrollee::provisionCloudProperties(const CloudProp& cloudProp,
                                                             const CloudPropProvStatusCb callback)
         {
-            OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Enter provisionCloudProperties");
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "provisionCloudProperties IN");
 
             if(!callback)
             {
@@ -414,6 +431,8 @@ namespace OIC
 
             m_cloudResource->registerCloudPropProvisioningStatusCallback(cloudPropProvStatusCb);
             m_cloudResource->provisionProperties(cloudProp);
+
+            OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "provisionCloudProperties OUT");
         }
     }
 }