From 483a341581f7d373e3df18b9aceaf5549888e5f1 Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Sat, 6 Mar 2021 11:54:18 +0900
Subject: [PATCH] Add logs into request handlers for debugging purpose

Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 src/common/request_handler/command_request_handler.cc     | 12 ++++++++++--
 src/common/request_handler/get_appinfo_request_handler.cc |  4 ++++
 src/common/request_handler/get_cert_request_handler.cc    |  4 ++++
 src/common/request_handler/get_depinfo_request_handler.cc |  4 ++++
 src/common/request_handler/get_pkginfo_request_handler.cc |  4 ++++
 src/common/request_handler/query_request_handler.cc       |  4 ++++
 src/common/request_handler/set_pkginfo_request_handler.cc |  8 +++++++-
 7 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/common/request_handler/command_request_handler.cc b/src/common/request_handler/command_request_handler.cc
index ed03eac..45d428b 100644
--- a/src/common/request_handler/command_request_handler.cc
+++ b/src/common/request_handler/command_request_handler.cc
@@ -7,6 +7,8 @@
 #include "pkginfo_parcelable.hh"
 #include "db_handle_provider.hh"
 
+#include "pkgmgrinfo_debug.h"
+
 #include <string>
 
 using namespace pkgmgr_common::parcel;
@@ -20,12 +22,18 @@ bool CommandRequestHandler::HandleRequest(unsigned char* data, int size,
   auto abstract_parcel = ParcelableFactory::GetInst().CreateParcel(data, size);
 
   if (abstract_parcel == nullptr ||
-      abstract_parcel->GetType() != ParcelableType::Command)
+      abstract_parcel->GetType() != ParcelableType::Command) {
+    _LOGE("Invalid parcel or type");
+    // TODO: return something
     return false;
+  }
 
   auto* parcel = dynamic_cast<CommandParcelable*>(abstract_parcel.get());
-  if (parcel == nullptr)
+  if (parcel == nullptr) {
+    _LOGE("Parcel is empty");
+    // TODO: return something
     return false;
+  }
 
   if (parcel->GetCmd() == CommandType::RemoveCache) {
     pkgmgr_common::DBHandleProvider::GetInst(parcel->GetUid()).SetMemoryMode(false);
diff --git a/src/common/request_handler/get_appinfo_request_handler.cc b/src/common/request_handler/get_appinfo_request_handler.cc
index 1608b3c..0d53cf9 100644
--- a/src/common/request_handler/get_appinfo_request_handler.cc
+++ b/src/common/request_handler/get_appinfo_request_handler.cc
@@ -7,6 +7,8 @@
 #include "appinfo_db_handler.hh"
 #include "get_appinfo_request_handler.hh"
 
+#include "pkgmgrinfo_debug.h"
+
 #include <string>
 
 using namespace pkgmgr_common::parcel;
@@ -21,6 +23,7 @@ bool GetAppinfoRequestHandler::HandleRequest(unsigned char* data, int size,
 
   if (abstract_parcel == nullptr ||
       abstract_parcel->GetType() != ParcelableType::Filter) {
+    _LOGE("Invalid parcel or type");
     result_ = std::make_shared<AppInfoParcelable>(
         PMINFO_R_ERROR, std::vector<application_x*>{});
     return false;
@@ -28,6 +31,7 @@ bool GetAppinfoRequestHandler::HandleRequest(unsigned char* data, int size,
 
   auto* parcel = dynamic_cast<FilterParcelable*>(abstract_parcel.get());
   if (parcel == nullptr) {
+    _LOGE("Parcel is empty");
     result_ = std::make_shared<AppInfoParcelable>(
         PMINFO_R_ERROR, std::vector<application_x*>{});
     return false;
diff --git a/src/common/request_handler/get_cert_request_handler.cc b/src/common/request_handler/get_cert_request_handler.cc
index 8d3eced..82b704d 100644
--- a/src/common/request_handler/get_cert_request_handler.cc
+++ b/src/common/request_handler/get_cert_request_handler.cc
@@ -6,6 +6,8 @@
 #include "parcelable_factory.hh"
 #include "cert_get_db_handler.hh"
 
+#include "pkgmgrinfo_debug.h"
+
 #include <string>
 
 using namespace pkgmgr_common::parcel;
@@ -20,6 +22,7 @@ bool GetCertRequestHandler::HandleRequest(unsigned char* data, int size,
 
   if (abstract_parcel == nullptr ||
       abstract_parcel->GetType() != ParcelableType::CertInfo) {
+    _LOGE("Invalid parcel or type");
     result_ = std::make_shared<CertInfoParcelable>(
         PMINFO_R_ERROR, nullptr);
     return false;
@@ -27,6 +30,7 @@ bool GetCertRequestHandler::HandleRequest(unsigned char* data, int size,
 
   auto* parcel = dynamic_cast<CertInfoParcelable*>(abstract_parcel.get());
   if (parcel == nullptr) {
+    _LOGE("Parcel is empty");
     result_ = std::make_shared<CertInfoParcelable>(
         PMINFO_R_ERROR, nullptr);
     return false;
diff --git a/src/common/request_handler/get_depinfo_request_handler.cc b/src/common/request_handler/get_depinfo_request_handler.cc
index 2102695..3765672 100644
--- a/src/common/request_handler/get_depinfo_request_handler.cc
+++ b/src/common/request_handler/get_depinfo_request_handler.cc
@@ -7,6 +7,8 @@
 #include "depinfo_db_handler.hh"
 #include "get_depinfo_request_handler.hh"
 
+#include "pkgmgrinfo_debug.h"
+
 #include <string>
 
 using namespace pkgmgr_common::parcel;
@@ -21,6 +23,7 @@ bool GetDepinfoRequestHandler::HandleRequest(unsigned char* data, int size,
 
   if (abstract_parcel == nullptr ||
       abstract_parcel->GetType() != ParcelableType::DepInfo) {
+    _LOGE("Invalid parcel or type");
     result_ = std::make_shared<DepInfoParcelable>(
         PMINFO_R_ERROR, std::vector<dependency_x*>{});
     return false;
@@ -28,6 +31,7 @@ bool GetDepinfoRequestHandler::HandleRequest(unsigned char* data, int size,
 
   auto* parcel = dynamic_cast<DepInfoParcelable*>(abstract_parcel.get());
   if (parcel == nullptr) {
+    _LOGE("Parcel is empty");
     result_ = std::make_shared<DepInfoParcelable>(
         PMINFO_R_ERROR, std::vector<dependency_x*>{});
     return false;
diff --git a/src/common/request_handler/get_pkginfo_request_handler.cc b/src/common/request_handler/get_pkginfo_request_handler.cc
index c057100..f2b8da3 100644
--- a/src/common/request_handler/get_pkginfo_request_handler.cc
+++ b/src/common/request_handler/get_pkginfo_request_handler.cc
@@ -7,6 +7,8 @@
 #include "pkg_get_db_handler.hh"
 #include "get_pkginfo_request_handler.hh"
 
+#include "pkgmgrinfo_debug.h"
+
 #include <string>
 
 using namespace pkgmgr_common::parcel;
@@ -21,6 +23,7 @@ bool GetPkginfoRequestHandler::HandleRequest(unsigned char* data, int size,
 
   if (abstract_parcel == nullptr ||
       abstract_parcel->GetType() != ParcelableType::Filter) {
+    _LOGE("Invalid parcel or type");
     result_ = std::make_shared<PkgInfoParcelable>(
         PMINFO_R_ERROR, std::vector<package_x*>{});
     return false;
@@ -28,6 +31,7 @@ bool GetPkginfoRequestHandler::HandleRequest(unsigned char* data, int size,
 
   auto* parcel = dynamic_cast<FilterParcelable*>(abstract_parcel.get());
   if (parcel == nullptr) {
+    _LOGE("Parcel is empty");
     result_ = std::make_shared<PkgInfoParcelable>(
         PMINFO_R_ERROR, std::vector<package_x*>{});
     return false;
diff --git a/src/common/request_handler/query_request_handler.cc b/src/common/request_handler/query_request_handler.cc
index 2198e60..7949a71 100644
--- a/src/common/request_handler/query_request_handler.cc
+++ b/src/common/request_handler/query_request_handler.cc
@@ -7,6 +7,8 @@
 #include "query_parcelable.hh"
 #include "query_handler.hh"
 
+#include "pkgmgrinfo_debug.h"
+
 #include <string>
 
 using namespace pkgmgr_common::parcel;
@@ -21,6 +23,7 @@ bool QueryRequestHandler::HandleRequest(unsigned char* data, int size,
 
   if (abstract_parcel == nullptr ||
       abstract_parcel->GetType() != ParcelableType::Query) {
+    _LOGE("Invalid parcel or type");
     result_ = std::make_shared<ResultParcelable>(
         PMINFO_R_ERROR, std::vector<std::vector<std::string>>{});
     return false;
@@ -28,6 +31,7 @@ bool QueryRequestHandler::HandleRequest(unsigned char* data, int size,
 
   auto* parcel = dynamic_cast<QueryParcelable*>(abstract_parcel.get());
   if (parcel == nullptr) {
+    _LOGE("Parcel is empty");
     result_ = std::make_shared<ResultParcelable>(
         PMINFO_R_ERROR, std::vector<std::vector<std::string>>{});
     return false;
diff --git a/src/common/request_handler/set_pkginfo_request_handler.cc b/src/common/request_handler/set_pkginfo_request_handler.cc
index ae55c9c..5823f72 100644
--- a/src/common/request_handler/set_pkginfo_request_handler.cc
+++ b/src/common/request_handler/set_pkginfo_request_handler.cc
@@ -8,6 +8,8 @@
 #include "pkg_set_db_handler.hh"
 #include "pkgmgr_parser.h"
 
+#include "pkgmgrinfo_debug.h"
+
 #include <string>
 
 using namespace pkgmgr_common::parcel;
@@ -22,6 +24,7 @@ bool SetPkginfoRequestHandler::HandleRequest(unsigned char* data, int size,
 
   if (abstract_parcel == nullptr ||
       abstract_parcel->GetType() != ParcelableType::PkgInfo) {
+    _LOGE("Invalid parcel or type");
     result_ = std::make_shared<ResultParcelable>(
         PM_PARSER_R_ERROR, std::vector<std::vector<std::string>>{});
     return false;
@@ -29,6 +32,7 @@ bool SetPkginfoRequestHandler::HandleRequest(unsigned char* data, int size,
 
   auto* parcel = dynamic_cast<PkgInfoParcelable*>(abstract_parcel->GetUid(), abstract_parcel.get());
   if (parcel == nullptr) {
+    _LOGE("Parcel is empty");
     result_ = std::make_shared<ResultParcelable>(
         PM_PARSER_R_ERROR, std::vector<std::vector<std::string>>{});
     return false;
@@ -43,8 +47,10 @@ bool SetPkginfoRequestHandler::HandleRequest(unsigned char* data, int size,
   for (auto& i : parcel->GetPkgInfo()) {
     db.SetPkgInfo(i);
     ret = db.Execute();
-    if (ret != PM_PARSER_R_OK)
+    if (ret != PM_PARSER_R_OK) {
+      _LOGE("Failed to set pkginfo");
       break;
+    }
   }
 
   result_ = std::make_shared<ResultParcelable>(ret, std::vector<std::vector<std::string>>{});
-- 
2.7.4