aboutsummaryrefslogtreecommitdiffstats
path: root/src/hs-clientmanager.cpp
diff options
context:
space:
mode:
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-03-26 10:35:18 +0800
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-03-26 10:56:56 +0800
commit2f7789558c98d8b79b41d62ac97f5bd6de557dc9 (patch)
tree43f360f6fb0558c56345c12b6ad6a9b6c6bce24e /src/hs-clientmanager.cpp
parent6c3015a7607c45313fa10792b9914864f8c25831 (diff)
Change log macro to AFB_XXX
1. using binder log macro instead of HMI_LOG. 2. unify log using level as below: AFB_ERROR: fatal error or serious error may occur. AFB_WARNING: input parameter error or not serious error. AFB_NOTICE: alert sth. AFB_INFO: print input argument or sth else. AFB_DEBUG: prompt for calling location. 3. delete hmi-debug.h. Change-Id: I203864ced39c418d2f792faa50ab2c009deb9d02 Signed-off-by: wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Diffstat (limited to 'src/hs-clientmanager.cpp')
-rw-r--r--src/hs-clientmanager.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/hs-clientmanager.cpp b/src/hs-clientmanager.cpp
index 8735c2e..1f8bc81 100644
--- a/src/hs-clientmanager.cpp
+++ b/src/hs-clientmanager.cpp
@@ -13,9 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+#include <cstring>
#include <algorithm>
#include "hs-clientmanager.h"
-#include "hmi-debug.h"
static const char _homescreen[] = "homescreen";
@@ -70,7 +71,7 @@ HS_ClientManager* HS_ClientManager::instance(void)
*/
int HS_ClientManager::init(void)
{
- HMI_NOTICE("homescreen-service","called.");
+ AFB_NOTICE("called.");
}
/**
@@ -88,7 +89,7 @@ HS_ClientCtxt* HS_ClientManager::createClientCtxt(afb_req_t req, std::string app
HS_ClientCtxt *ctxt = (HS_ClientCtxt *)afb_req_context_get(req);
if (!ctxt)
{
- HMI_NOTICE("homescreen-service", "create new session for %s", appid.c_str());
+ AFB_INFO( "create new session for %s", appid.c_str());
HS_ClientCtxt *ctxt = new HS_ClientCtxt(appid.c_str());
afb_req_session_set_LOA(req, 1);
afb_req_context_set(req, ctxt, cbRemoveClientCtxt);
@@ -142,11 +143,11 @@ void HS_ClientManager::removeClientCtxt(void *data)
HS_ClientCtxt *ctxt = (HS_ClientCtxt *)data;
if(ctxt == nullptr)
{
- HMI_ERROR("homescreen-service", "data is nullptr");
+ AFB_WARNING( "data is nullptr");
return;
}
- HMI_NOTICE("homescreen-service", "remove app %s", ctxt->id.c_str());
+ AFB_INFO( "remove app %s", ctxt->id.c_str());
std::lock_guard<std::mutex> lock(this->mtx);
removeClient(ctxt->id);
delete appid2ctxt[ctxt->id];
@@ -168,7 +169,7 @@ void HS_ClientManager::removeClientCtxt(void *data)
*/
int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const char *appid)
{
- HMI_NOTICE("homescreen-service","verb=[%s],appid=[%s].", verb, appid);
+ AFB_INFO("verb=[%s],appid=[%s].", verb, appid);
int ret = 0;
std::lock_guard<std::mutex> lock(this->mtx);
if(appid == nullptr) {
@@ -188,7 +189,7 @@ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c
ret = client->handleRequest(request, "subscribe");
}
else {
- HMI_NOTICE("homescreen-service","not exist session");
+ AFB_NOTICE("not exist session");
ret = AFB_REQ_NOT_STARTED_APPLICATION;
}
}
@@ -212,7 +213,7 @@ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c
int HS_ClientManager::pushEvent(const char *event, struct json_object *param, std::string appid)
{
if(event == nullptr) {
- HMI_ERROR("homescreen-service","event name is null.");
+ AFB_WARNING("event name is null.");
return -1;
}