Add debugging log for disabled pkg/app for cache

Change-Id: I360d3bd833b7f05db225ae437bdab35adc5555af
Signed-off-by: ilho kim <ilho159.kim@samsung.com>
(cherry picked from commit 669898d06afe072322181aa82643bb3717b900d2)

diff --git a/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.cc
index c01f04c..3707b1b 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.cc
@@ -16,18 +16,26 @@
 
 #include "app_disable_app_filter_checker.hh"
 
-#include <string.h>
-
 #include "pkgmgrinfo_basic.h"
 #include "pkgmgrinfo_private.h"
 
+#include "utils/logging.hh"
+
 namespace pkgmgr_server {
 namespace database {
 
 bool AppDisableAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
     application_x* app_info, package_x* pkg_info) {
-  return (node->value != nullptr && app_info->is_disabled != nullptr &&
-          strcasecmp(node->value, app_info->is_disabled) == 0);
+  if (node->value == nullptr || app_info->is_disabled == nullptr)
+    return false;
+
+  if (strcasecmp(node->value, app_info->is_disabled) != 0) {
+    if (strcasecmp(app_info->is_disabled, "true") == 0)
+      LOG(WARNING) << "The application [" << app_info->appid << "] is disabled";
+    return false;
+  }
+
+  return true;
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.cc
index f4667f4..1c2efde 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.cc
@@ -19,13 +19,25 @@
 #include "pkgmgrinfo_basic.h"
 #include "pkgmgrinfo_private.h"
 
+#include "utils/logging.hh"
+
 namespace pkgmgr_server {
 namespace database {
 
 bool PkgDisableAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
     application_x* app_info, package_x* pkg_info) {
-  return (node->value != nullptr &&
-      strcasecmp(node->value, pkg_info->is_disabled) == 0);
+  if (node->value == nullptr || pkg_info->is_disabled == nullptr)
+    return false;
+
+  if (strcasecmp(node->value, pkg_info->is_disabled) != 0) {
+    if (strcasecmp(pkg_info->is_disabled, "true") == 0)
+      LOG(WARNING) << "The pacakge [" << pkg_info->package
+          << "] to which the application ["
+          << app_info->appid << "] belongs is disabled";
+    return false;
+  }
+
+  return true;
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/pkg_filter_checker/disable_pkg_filter_checker.cc b/src/server/filter_checker/pkg_filter_checker/disable_pkg_filter_checker.cc
index ccd9d4a..e80d125 100644 (file)
--- a/src/server/filter_checker/pkg_filter_checker/disable_pkg_filter_checker.cc
+++ b/src/server/filter_checker/pkg_filter_checker/disable_pkg_filter_checker.cc
@@ -16,13 +16,23 @@
 
 #include "disable_pkg_filter_checker.hh"
 
+#include "utils/logging.hh"
+
 namespace pkgmgr_server {
 namespace database {
 
 bool DisablePkgFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
                                         package_x* info) {
-  return (node->value != nullptr && info->is_disabled != nullptr &&
-          strcasecmp(node->value, info->is_disabled) == 0);
+  if (node->value == nullptr || info->is_disabled == nullptr)
+    return false;
+
+  if (strcasecmp(node->value, info->is_disabled) != 0) {
+    if (strcasecmp(info->is_disabled, "true") == 0)
+      LOG(WARNING) << "The package [" << info->package << "] is disabled";
+    return false;
+  }
+
+  return true;
 }
 
 }  // namespace database