From dab7ef876d131e7f7856b82cc9159181aec2374a Mon Sep 17 00:00:00 2001 From: Piotr Kosko Date: Wed, 27 May 2015 14:11:32 +0200 Subject: [PATCH] [Systeminfo] Added logs in methods onEntered and onReturn Change-Id: I8be44846211cee9e5edfc3b915e882536db0f207 Signed-off-by: Piotr Kosko --- src/systeminfo/systeminfo_instance.cc | 45 ++++++++++++++------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/systeminfo/systeminfo_instance.cc b/src/systeminfo/systeminfo_instance.cc index acf3af91..fa76b16e 100644 --- a/src/systeminfo/systeminfo_instance.cc +++ b/src/systeminfo/systeminfo_instance.cc @@ -103,7 +103,7 @@ const std::string kPropertyIdCameraFlash= "CAMERA_FLASH"; } SysteminfoInstance::SysteminfoInstance() { - + LoggerD("Enter"); using std::placeholders::_1; using std::placeholders::_2; @@ -147,7 +147,7 @@ SysteminfoInstance::~SysteminfoInstance() { } void SysteminfoInstance::GetCapabilities(const picojson::value& args, picojson::object& out) { - LoggerD(""); + LoggerD("Enter"); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -232,7 +232,7 @@ void SysteminfoInstance::GetCapabilities(const picojson::value& args, picojson:: } void SysteminfoInstance::GetCapability(const picojson::value& args, picojson::object& out) { - + LoggerD("Enter"); CHECK_EXIST(args, "key", out) const std::string& key = args.get("key").get(); LoggerD("Getting capability with key: %s ", key.c_str()); @@ -248,7 +248,7 @@ void SysteminfoInstance::GetCapability(const picojson::value& args, picojson::ob } void SysteminfoInstance::GetPropertyValue(const picojson::value& args, picojson::object& out) { - LoggerD(""); + LoggerD("Enter"); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "property", out) const double callback_id = args.get("callbackId").get(); @@ -279,7 +279,7 @@ void SysteminfoInstance::GetPropertyValue(const picojson::value& args, picojson: } void SysteminfoInstance::GetPropertyValueArray(const picojson::value& args, picojson::object& out) { - LoggerD(""); + LoggerD("Enter"); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "property", out) const double callback_id = args.get("callbackId").get(); @@ -291,6 +291,7 @@ void SysteminfoInstance::GetPropertyValueArray(const picojson::value& args, pico picojson::value result = picojson::value(picojson::object()); PlatformResult ret = SysteminfoUtils::GetPropertyValue(prop_id, true, result); if (ret.IsError()) { + LoggerE("Failed: GetPropertyValue()"); ReportError(ret,&(response->get())); return; } @@ -309,7 +310,7 @@ void SysteminfoInstance::GetPropertyValueArray(const picojson::value& args, pico } void SysteminfoInstance::AddPropertyValueChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD(""); + LoggerD("Enter"); // Check type of property for which listener should be registered CHECK_EXIST(args, "property", out) const std::string& property_name = args.get("property").get(); @@ -361,7 +362,7 @@ void SysteminfoInstance::AddPropertyValueChangeListener(const picojson::value& a } void SysteminfoInstance::GetTotalMemory(const picojson::value& args, picojson::object& out) { - LoggerD(""); + LoggerD("Enter"); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -380,7 +381,7 @@ void SysteminfoInstance::GetTotalMemory(const picojson::value& args, picojson::o } void SysteminfoInstance::GetAvailableMemory(const picojson::value& args, picojson::object& out) { - LoggerD(""); + LoggerD("Enter"); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -400,6 +401,7 @@ void SysteminfoInstance::GetAvailableMemory(const picojson::value& args, picojso void SysteminfoInstance::GetCount(const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); CHECK_EXIST(args, "property", out) const std::string& property = args.get("property").get(); LoggerD("Getting count of property with id: %s ", property.c_str()); @@ -409,6 +411,7 @@ void SysteminfoInstance::GetCount(const picojson::value& args, picojson::object& unsigned long count = 0; PlatformResult ret = SysteminfoUtils::GetCount(property, count); if (ret.IsError()) { + LoggerE("Failed: GetCount()"); ReportError(ret, &out); return; } @@ -419,7 +422,7 @@ void SysteminfoInstance::GetCount(const picojson::value& args, picojson::object& } void SysteminfoInstance::RemovePropertyValueChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD(""); + LoggerD("Enter"); // Check type of property for which listener should be removed CHECK_EXIST(args, "property", out) @@ -522,7 +525,7 @@ void SysteminfoInstance::GetMaxBrightness(const picojson::value& args, picojson: //Callback functions void OnBatteryChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdBattery); @@ -538,7 +541,7 @@ void OnBatteryChangedCallback(SysteminfoInstance& instance) void OnCpuChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdCpu); @@ -554,7 +557,7 @@ void OnCpuChangedCallback(SysteminfoInstance& instance) void OnStorageChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdStorage); @@ -570,7 +573,7 @@ void OnStorageChangedCallback(SysteminfoInstance& instance) void OnDisplayChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdDisplay); @@ -586,7 +589,7 @@ void OnDisplayChangedCallback(SysteminfoInstance& instance) void OnDeviceOrientationChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdDeviceOrientation); @@ -602,7 +605,7 @@ void OnDeviceOrientationChangedCallback(SysteminfoInstance& instance) void OnLocaleChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdLocale); @@ -618,7 +621,7 @@ void OnLocaleChangedCallback(SysteminfoInstance& instance) void OnNetworkChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdNetwork); @@ -634,7 +637,7 @@ void OnNetworkChangedCallback(SysteminfoInstance& instance) void OnWifiNetworkChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdWifiNetwork); @@ -650,7 +653,7 @@ void OnWifiNetworkChangedCallback(SysteminfoInstance& instance) void OnCellularNetworkChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdCellularNetwork); @@ -666,7 +669,7 @@ void OnCellularNetworkChangedCallback(SysteminfoInstance& instance) void OnPeripheralChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdPeripheral); @@ -682,7 +685,7 @@ void OnPeripheralChangedCallback(SysteminfoInstance& instance) void OnMemoryChangedCallback(SysteminfoInstance& instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdMemory); @@ -698,7 +701,7 @@ void OnMemoryChangedCallback(SysteminfoInstance& instance) void OnBrigthnessChangedCallback(SysteminfoInstance &instance) { - LoggerD(""); + LoggerD("Enter"); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(kPropertyIdCameraFlash); -- 2.34.1