AMD log shortening

- Fix some typos
- Merge two logs in AppStatusManager::Update
- Shorten frequently called Logs in reqeust_manager

Change-Id: I79c2fda1c2089379034cb4c06f8a8a619d2cbaef
Signed-off-by: newb1e <jihoi.kim@samsung.com>

diff --git a/src/lib/amd_launch.cc b/src/lib/amd_launch.cc
index 3d2661eec9fca41c7fe60d73dddf651c161413bd..383d4728480d9a155ad5b34d74b906d4c009f31e 100644 (file)
--- a/src/lib/amd_launch.cc
+++ b/src/lib/amd_launch.cc
@@ -1364,12 +1364,9 @@ static int OnAppStatusCleanup(const char* msg, int arg1, int arg2, void* arg3,
 
 static int HandleAppLaunchedEvent(amd::LaunchContext* context) {
   auto& req = context->GetRequest();
-  _W("[%s] request_id: %u, appid: %s, pid: %d, pending: %s",
-      aul_cmd_convert_to_string(req->GetCmd()),
-      req->GetID(),
-      context->GetAppId().c_str(),
-      context->GetPid(),
-      context->IsPending() ? "true" : "false");
+  _W("reqid=%u cmd=%d pid=%d pending=%s app=%s",
+      req->GetID(), req->GetCmd(), context->GetPid(),
+      context->IsPending() ? "Y" : "N", context->GetAppId().c_str());
 
   if (context->IsPending()) {
     if (req->GetCmd() == APP_SEND_LAUNCH_REQUEST_SYNC) {

diff --git a/src/lib/amd_login_monitor.c b/src/lib/amd_login_monitor.c
index c41804bf80e9310d78ee5945016191f8aaaa153d..8047d7bf882d8e5f1c04bfeb8d59b0dadea471f3 100644 (file)
--- a/src/lib/amd_login_monitor.c
+++ b/src/lib/amd_login_monitor.c
@@ -499,7 +499,7 @@ static gboolean __login_timeout_handler(gpointer data)
                 * In this case, we should check whether the apps_rw path exists or not.
                 */
                if (!__exist_apps_rw(user->uid)) {
-                       _W("apps_rw is not existed");
+                       _W("apps_rw doesn't exist");
                        return G_SOURCE_CONTINUE;
                }
        }

diff --git a/src/lib/amd_socket.c b/src/lib/amd_socket.c
index c00aef34a5dc8feaae95b5c067f941fae195e757..e593f187331842e75f2b51a387dcd5900b69e410 100644 (file)
--- a/src/lib/amd_socket.c
+++ b/src/lib/amd_socket.c
@@ -179,7 +179,7 @@ static int __create_launchpad_client_sock(const char *pad_type, uid_t uid)
        ret = __connect_client_sock(fd, (struct sockaddr *)&saddr,
                        sizeof(saddr), 100 * 1000);
        if (ret < -1) {
-               _E("maybe peer not launched or peer daed\n");
+               _E("maybe peer not launched or peer dead\n");
                if (retry > 0) {
                        usleep(100 * 1000);
                        retry--;

diff --git a/src/lib/app_com/app_com_socket.cc b/src/lib/app_com/app_com_socket.cc
index 7cc17c3ee315dd792f1743bf71087866dbcce6ea..0f965ae88c03448c7b89c0a376e2114d88cac6b4 100644 (file)
--- a/src/lib/app_com/app_com_socket.cc
+++ b/src/lib/app_com/app_com_socket.cc
@@ -126,7 +126,7 @@ gboolean AppComSocket::OnDataReceived(GIOChannel* channel,
 gboolean AppComSocket::OnSocketDisconnected(GIOChannel* channel,
     GIOCondition cond, gpointer user_data) {
   auto* handle = static_cast<AppComSocket*>(user_data);
-  _E("Error occrus. condition(%d), pid(%d), fd(%d)",
+  _E("Error. condition(%d), pid(%d), fd(%d)",
       cond, handle->GetPid(), handle->GetFd());
   handle->disconn_source_ = 0;
   handle->listener_->OnDisconnected(handle->GetPid(), handle->GetUid());

diff --git a/src/lib/app_status/app_status_manager.cc b/src/lib/app_status/app_status_manager.cc
index 100960e8efad524c8dd9457519f5bb7abe9457ff..5d77062f8d73b339880915d9edaa8a6e0cf42cf5 100644 (file)
--- a/src/lib/app_status/app_status_manager.cc
+++ b/src/lib/app_status/app_status_manager.cc
@@ -868,7 +868,11 @@ int AppStatusManager::Remove(AppStatusPtr app_status) {
 
 int AppStatusManager::Update(const AppStatusPtr& app_status, int status,
     bool force, bool update_group_info) {
-  _D("pid: %d, status: %d", app_status->GetPID(), app_status->GetStatus());
+  _W("pid=%d|%s:%d -> %s:%d|app=%s pkg=%s", app_status->GetPID(),
+      aul_app_status_convert_to_string(app_status->GetStatus()),
+      app_status->GetStatus(), aul_app_status_convert_to_string(status), status,
+      app_status->GetAppID().c_str(), app_status->GetPackageID().c_str());
+
   _noti_send(AMD_NOTI_MSG_APP_STATUS_UPDATE_STATUS_START, status, force,
       app_status.get(), nullptr);
   if (app_status->GetStatus() == STATUS_DYING) {
@@ -895,10 +899,6 @@ int AppStatusManager::Update(const AppStatusPtr& app_status, int status,
   }
 
   UpdatePackageStatus(app_status);
-  _W("pid: %d, appid: %s, pkgid: %s, status: %s(%d)", app_status->GetPID(),
-     app_status->GetAppID().c_str(), app_status->GetPackageID().c_str(),
-     aul_app_status_convert_to_string(app_status->GetStatus()),
-     app_status->GetStatus());
   _noti_send(AMD_NOTI_MSG_APP_STATUS_UPDATE_STATUS_END, force,
       update_group_info, app_status.get(), nullptr);
   app_status_dao_->UpdateAppStatus(app_status);

diff --git a/src/lib/launch/app_control_result_info.cc b/src/lib/launch/app_control_result_info.cc
index bd7e7a67ce6b53ea969ef59ecc5d26c6619cc8c3..02440dd75b6eabf92ece35580cfd4f452e241f92 100644 (file)
--- a/src/lib/launch/app_control_result_info.cc
+++ b/src/lib/launch/app_control_result_info.cc
@@ -110,7 +110,7 @@ void AppControlResultInfo::Manager::Append(Request* req, pid_t pid) {
 
   struct timespec end = { 0, };
   clock_gettime(CLOCK_MONOTONIC, &end);
-  _W("sequence: %s, requrest_id: %u", sequence.c_str(), req->GetID());
+  _W("sequence: %s, request_id: %u", sequence.c_str(), req->GetID());
   infos_[sequence] = std::make_unique<AppControlResultInfo>(
       pid, req->DetachFD(), sequence, this,
       GetTimeoutInterval(&req->GetStartTime(), &end, req->GetTimeout()));

diff --git a/src/lib/request/request_manager.cc b/src/lib/request/request_manager.cc
index d088e7365ddf277908714646d20775ec72c03873..d68c39087178f5e5eba557db1c3fce02b270d4f1 100644 (file)
--- a/src/lib/request/request_manager.cc
+++ b/src/lib/request/request_manager.cc
@@ -302,14 +302,14 @@ gboolean RequestManager::ProcessRequest(gpointer data) {
 }
 
 void RequestManager::DispatchRequest(const RequestPtr& req) {
-  _I("cmd(%s:%d), req_id(%d), caller_pid(%d), caller_uid(%u), clifd(%d)",
-     aul_cmd_convert_to_string(req->GetCmd()), req->GetCmd(), req->GetID(),
-     req->GetPID(), req->GetUID(), req->GetClientFD());
+  _I("reqid=%d cpid=%d cuid=%u clifd=%d cmd=%s:%d",
+      req->GetID(), req->GetPID(), req->GetUID(), req->GetClientFD(),
+      aul_cmd_convert_to_string(req->GetCmd()), req->GetCmd());
 
   auto* dispatcher = GetInst().dispatch_map_[req->GetCmd()];
   if (__builtin_expect(dispatcher != nullptr, 1)) {
     if (dispatcher(req.get()) != 0) {
-      _E("callback returns FALSE : cmd(%s:%d)",
+      _E("dispatch_cb fail|cmd=%s:%d",
           aul_cmd_convert_to_string(req->GetCmd()), req->GetCmd());
     }
   } else {
@@ -421,9 +421,8 @@ void RequestManager::CynaraResponseCallback(amd_cynara_res res,
   auto req = static_cast<Request*>(request)->GetSharedPtr();
   req->Unref();
   if (res == AMD_CYNARA_ALLOWED) {
-    _W("request has been allowed by cynara. cmd(%s:%d), caller(%d), req_id(%u)",
-        aul_cmd_convert_to_string(req->GetCmd()), req->GetCmd(), req->GetPID(),
-        req->GetID());
+    _W("Cynara allowed|reqid=%d cmd=%s:%d cpid=%d", req->GetID(),
+        aul_cmd_convert_to_string(req->GetCmd()), req->GetCmd(), req->GetPID());
 
     int ret = req->CheckTargetUser();
     if (ret > 0) {
@@ -438,9 +437,8 @@ void RequestManager::CynaraResponseCallback(amd_cynara_res res,
     req->SetRequestType("");
     GetInst().ProcessRequest(req.get());
   } else {
-    _E("request has been denied by cynara. cmd(%s:%d), caller(%d), req_id(%u)",
-        aul_cmd_convert_to_string(req->GetCmd()), req->GetCmd(), req->GetPID(),
-        req->GetID());
+    _E("Cynara denied|reqid=%d cmd=%s:%d cpid=%d", req->GetID(),
+        aul_cmd_convert_to_string(req->GetCmd()), req->GetCmd(), req->GetPID());
     req->SendResult(-EILLEGALACCESS);
   }
 
@@ -484,7 +482,7 @@ gboolean RequestManager::RequestHandler(GIOChannel* io,
 
   if (!req->CheckRequestTime() && !req->IsIndirectRequest() &&
       !(req->GetOption() & AUL_SOCK_NOREPLY)) {
-    _E("Reject request. cmd(%d), caller(%d)", req->GetCmd(), req->GetPID());
+    _E("Reject request|cmd=%d cpid=%d", req->GetCmd(), req->GetPID());
 
     req->SendResult(-EAGAIN);
     return G_SOURCE_CONTINUE;
@@ -500,20 +498,17 @@ gboolean RequestManager::RequestHandler(GIOChannel* io,
   if (req->GetUID() >= REGULAR_UID_MIN || req->IsIndirectRequest()) {
     if (req->GetUID() >= REGULAR_UID_MIN &&
         req->GetUID() != org_target_uid) {
-      _E("request has been deined - uid(%u), target_uid(%u)", req->GetUID(),
-          org_target_uid);
+      _E("Request denied|uid=%u tuid=%u", req->GetUID(), org_target_uid);
 
       req->SendResult(-EILLEGALACCESS);
       return G_SOURCE_CONTINUE;
     }
 
-    _W("cynara check. cmd(%s:%d), caller_pid(%d), req_id(%u)",
-        aul_cmd_convert_to_string(req->GetCmd()), req->GetCmd(),
-        req->GetPID(), req->GetID());
+    _W("Cynara check|reqid=%d cmd=%s:%d cpid=%d", req->GetID(),
+        aul_cmd_convert_to_string(req->GetCmd()), req->GetCmd(), req->GetPID());
 
     int ret = _cynara_check_privilege(req.get(), CynaraResponseCallback);
     if (ret < 0) {
-      _E("request has been denied by cynara");
       req->SendResult(-EILLEGALACCESS);
       return G_SOURCE_CONTINUE;
     } else if (ret == AMD_CYNARA_UNKNOWN) {

diff --git a/src/lib/signal/dbus_broker.cc b/src/lib/signal/dbus_broker.cc
index c7060555b5d78d782b59816947c0fb5ee95fbb63..28cc9e8924d63c2407184d1c3380a7e9dc967e2a 100644 (file)
--- a/src/lib/signal/dbus_broker.cc
+++ b/src/lib/signal/dbus_broker.cc
@@ -238,7 +238,7 @@ DBusBroker::~DBusBroker() {
 void DBusBroker::Init() {
   cancellable_ = g_cancellable_new();
   if (cancellable_ == nullptr) {
-    _E("g_cancellable_new() is failred");
+    _E("g_cancellable_new() failed");
     return;
   }
 

diff --git a/src/modules/ui-core/src/app_group.c b/src/modules/ui-core/src/app_group.c
index 41336bbc7b0367700b77f17d8749ebdac1c9c2b9..b4a14d63cde84ec3b871ad5bdf4713315e765282 100644 (file)
--- a/src/modules/ui-core/src/app_group.c
+++ b/src/modules/ui-core/src/app_group.c
@@ -561,7 +561,7 @@ static app_group_node_h __app_group_node_find_second_leader(const char *id)
        if (node) {
                ctx = (struct app_group_context_s *)node->data;
                if (ctx && ctx->can_be_leader) {
-                       _W("Sencond leader. leader_id(%s), id(%s)",
+                       _W("Second leader. leader_id(%s), id(%s)",
                                        id, ctx->id);
                        return node;
                }