From c8177b9dad0e29e11e2664e8ca9477d36344e962 Mon Sep 17 00:00:00 2001 From: Jihoon Chung Date: Wed, 17 Jul 2013 11:32:35 +0900 Subject: [PATCH] Replace LogInfo to LogDebug [Issue#] N/A [Problem] N/A [Cause] N/A [Solution] Replace LogInfo to LogDebug Platform policy isn't used LogInfo [SCMRequest] N/A Change-Id: I0aa6c90972a6189786cde68766f8f893d6aa7362 --- src/configuration_parser/widget_parser.cpp | 8 ++--- src/jobs/plugin_install/job_plugin_install.cpp | 2 +- src/jobs/plugin_install/plugin_install_task.cpp | 28 ++++++++--------- src/jobs/widget_install/job_widget_install.cpp | 36 +++++++++++----------- src/jobs/widget_install/task_ace_check.cpp | 26 ++++++++-------- src/jobs/widget_install/task_certify.cpp | 16 +++++----- src/jobs/widget_install/task_commons.cpp | 2 +- src/jobs/widget_install/task_database.cpp | 18 +++++------ src/jobs/widget_install/task_file_manipulation.cpp | 2 +- src/jobs/widget_install/task_install_ospsvc.cpp | 2 +- src/jobs/widget_install/task_manifest_file.cpp | 18 +++++------ src/jobs/widget_install/task_prepare_reinstall.cpp | 28 ++++++++--------- src/jobs/widget_install/task_recovery.cpp | 2 +- src/jobs/widget_install/task_smack.cpp | 12 ++++---- src/jobs/widget_install/task_widget_config.cpp | 16 +++++----- src/jobs/widget_install/widget_unzip.cpp | 18 +++++------ src/jobs/widget_uninstall/job_widget_uninstall.cpp | 2 +- src/jobs/widget_uninstall/task_check.cpp | 4 +-- src/jobs/widget_uninstall/task_db_update.cpp | 2 +- src/jobs/widget_uninstall/task_remove_files.cpp | 4 +-- src/jobs/widget_uninstall/task_smack.cpp | 2 +- .../widget_uninstall/task_uninstall_ospsvc.cpp | 4 +-- src/logic/installer_logic.cpp | 2 +- src/misc/feature_logic.cpp | 4 +-- src/pkg-manager/pkgmgr_signal.cpp | 6 ++-- .../installer_callbacks_translate.cpp | 10 +++--- src/wrt-installer/plugin_utils.cpp | 4 +-- src/wrt-installer/wrt-installer.cpp | 34 ++++++++++---------- src/wrt-installer/wrt_installer_api.cpp | 18 +++++------ tests/general/TestInit.cpp | 2 +- 30 files changed, 166 insertions(+), 166 deletions(-) mode change 100755 => 100644 src/jobs/widget_install/task_manifest_file.cpp diff --git a/src/configuration_parser/widget_parser.cpp b/src/configuration_parser/widget_parser.cpp index 4e510cd..8425627 100644 --- a/src/configuration_parser/widget_parser.cpp +++ b/src/configuration_parser/widget_parser.cpp @@ -984,7 +984,7 @@ class AppControlParser : public ElementParser if (!m_value.IsNull() && *m_value == ignoreUri) { - LogInfo("exception : '" << *m_value << "' scheme will be ignored."); + LogDebug("exception : '" << *m_value << "' scheme will be ignored."); m_value = DPL::OptionalString::Null; } @@ -2789,7 +2789,7 @@ void WidgetParser::Accept(const XmlAttribute& attribute) m_version = attribute.value; NormalizeString(m_version); } else if (attribute.name == L"min-version") { - LogInfo("min-version attribute was found. Value: " << attribute.value); + LogDebug("min-version attribute was found. Value: " << attribute.value); m_minVersion = attribute.value; NormalizeString(m_minVersion); m_data.minVersionRequired = m_minVersion; @@ -2855,8 +2855,8 @@ void WidgetParser::Accept(const XmlAttribute& attribute) //Any other value consider as a namespace definition } else if (attribute.name == L"xmlns" || attribute.prefix == L"xmlns") { - LogInfo("Namespace domain: " << attribute.name); - LogInfo("Namespace value: " << attribute.value); + LogDebug("Namespace domain: " << attribute.name); + LogDebug("Namespace value: " << attribute.value); m_nameSpaces[attribute.name] = attribute.value; } else { LogError("Unknown attirbute: namespace=" << attribute.ns << diff --git a/src/jobs/plugin_install/job_plugin_install.cpp b/src/jobs/plugin_install/job_plugin_install.cpp index 811c049..6cc3c3f 100644 --- a/src/jobs/plugin_install/job_plugin_install.cpp +++ b/src/jobs/plugin_install/job_plugin_install.cpp @@ -73,7 +73,7 @@ void JobPluginInstall::SendFinishedSuccess() getInstallerStruct().finishedCallback(getInstallerStruct().userParam, Jobs::Exceptions::ErrorPluginInstallationFailed); - LogInfo("Installation: " << getFilePath() << + LogDebug("Installation: " << getFilePath() << " NOT possible"); } } diff --git a/src/jobs/plugin_install/plugin_install_task.cpp b/src/jobs/plugin_install/plugin_install_task.cpp index 861dbc2..2b90704 100644 --- a/src/jobs/plugin_install/plugin_install_task.cpp +++ b/src/jobs/plugin_install/plugin_install_task.cpp @@ -85,7 +85,7 @@ PluginInstallTask::~PluginInstallTask() void PluginInstallTask::stepCheckPluginPath() { - LogInfo("Plugin installation: step CheckPluginPath"); + LogDebug("Plugin installation: step CheckPluginPath"); if(!m_context->pluginFilePath.Exists()){ ThrowMsg(Exceptions::PluginPathFailed, @@ -97,7 +97,7 @@ void PluginInstallTask::stepCheckPluginPath() void PluginInstallTask::stepParseConfigFile() { - LogInfo("Plugin installation: step parse config file"); + LogDebug("Plugin installation: step parse config file"); DPL::Utils::Path filename = m_context->pluginFilePath; filename /= GlobalConfig::GetPluginMetafileName(); @@ -107,7 +107,7 @@ void PluginInstallTask::stepParseConfigFile() return; } - LogInfo("Plugin Config file::" << filename.Filename()); + LogDebug("Plugin Config file::" << filename.Filename()); Try { @@ -167,7 +167,7 @@ void PluginInstallTask::stepCheckIfAlreadyInstalled() void PluginInstallTask::stepLoadPluginLibrary() { - LogInfo("Plugin installation: step load library"); + LogDebug("Plugin installation: step load library"); DISABLE_IF_PLUGIN_WITHOUT_LIB() @@ -264,16 +264,16 @@ void PluginInstallTask::stepLoadPluginLibrary() m_libraryObjects = PluginObjectsPtr(new PluginObjects()); const js_entity_definition_t *rawEntityListIterator = rawEntityList; - LogInfo("#####"); - LogInfo("##### Plugin: " << filename.Filename() << " supports new plugin API"); - LogInfo("#####"); + LogDebug("#####"); + LogDebug("##### Plugin: " << filename.Filename() << " supports new plugin API"); + LogDebug("#####"); while (rawEntityListIterator->parent_name != NULL && rawEntityListIterator->object_name != NULL) { - LogInfo("##### [" << rawEntityListIterator->object_name << "]: "); - LogInfo("##### Parent: " << rawEntityListIterator->parent_name); - LogInfo("#####"); + LogDebug("##### [" << rawEntityListIterator->object_name << "]: "); + LogDebug("##### Parent: " << rawEntityListIterator->parent_name); + LogDebug("#####"); m_libraryObjects->addObjects(rawEntityListIterator->parent_name, rawEntityListIterator->object_name); @@ -296,7 +296,7 @@ void PluginInstallTask::stepLoadPluginLibrary() void PluginInstallTask::stepRegisterPlugin() { - LogInfo("Plugin installation: step register Plugin"); + LogDebug("Plugin installation: step register Plugin"); m_pluginHandle = PluginDAO::registerPlugin(m_pluginInfo, m_context->pluginFilePath.Fullpath()); @@ -306,7 +306,7 @@ void PluginInstallTask::stepRegisterPlugin() void PluginInstallTask::stepRegisterFeatures() { - LogInfo("Plugin installation: step register features"); + LogDebug("Plugin installation: step register features"); FOREACH(it, m_pluginInfo.m_featureContainer) { @@ -318,7 +318,7 @@ void PluginInstallTask::stepRegisterFeatures() void PluginInstallTask::stepRegisterPluginObjects() { - LogInfo("Plugin installation: step register objects"); + LogDebug("Plugin installation: step register objects"); DISABLE_IF_PLUGIN_WITHOUT_LIB() @@ -349,7 +349,7 @@ void PluginInstallTask::stepRegisterPluginObjects() void PluginInstallTask::stepResolvePluginDependencies() { - LogInfo("Plugin installation: step resolve dependencies "); + LogDebug("Plugin installation: step resolve dependencies "); //DISABLE_IF_PLUGIN_WITHOUT_LIB if (m_pluginInfo.m_libraryName.empty()) { diff --git a/src/jobs/widget_install/job_widget_install.cpp b/src/jobs/widget_install/job_widget_install.cpp index c77fcf3..3b45ff2 100644 --- a/src/jobs/widget_install/job_widget_install.cpp +++ b/src/jobs/widget_install/job_widget_install.cpp @@ -175,7 +175,7 @@ JobWidgetInstall::JobWidgetInstall( ConfigureResult result = prepareInstallation(widgetPath); if (result == ConfigureResult::Ok) { - LogInfo("Configure installation succeeded"); + LogDebug("Configure installation succeeded"); m_installerContext.job->SetProgressFlag(true); AddTask(new TaskRecovery(m_installerContext)); @@ -203,8 +203,8 @@ JobWidgetInstall::JobWidgetInstall( AddTask(new TaskAceCheck(m_installerContext)); AddTask(new TaskSmack(m_installerContext)); } else if (result == ConfigureResult::Updated) { - LogInfo("Configure installation updated"); - LogInfo("Widget Update"); + LogDebug("Configure installation updated"); + LogDebug("Widget Update"); m_installerContext.job->SetProgressFlag(true); if (m_installerContext.mode.command == @@ -381,7 +381,7 @@ void JobWidgetInstall::setTizenId( break; } m_installerContext.widgetConfig.tzPkgid = pkgId; - LogInfo("tizen_id name was generated by WRT: " << + LogDebug("tizen_id name was generated by WRT: " << m_installerContext.widgetConfig.tzPkgid); } @@ -438,9 +438,9 @@ void JobWidgetInstall::setTizenId( m_installerContext. widgetConfig. tzPkgid)); - LogInfo("Tizen App Id : " << m_installerContext.widgetConfig.tzAppid); - LogInfo("Tizen Pkg Id : " << m_installerContext.widgetConfig.tzPkgid); - LogInfo("W3C Widget GUID : " << m_installerContext.widgetConfig.guid); + LogDebug("Tizen App Id : " << m_installerContext.widgetConfig.tzAppid); + LogDebug("Tizen Pkg Id : " << m_installerContext.widgetConfig.tzPkgid); + LogDebug("W3C Widget GUID : " << m_installerContext.widgetConfig.guid); } void JobWidgetInstall::configureWidgetLocation(const std::string & widgetPath, @@ -457,7 +457,7 @@ void JobWidgetInstall::configureWidgetLocation(const std::string & widgetPath, m_installerContext.locations->registerAppid( DPL::ToUTF8String(m_installerContext.widgetConfig.tzAppid)); - LogInfo("widgetSource " << widgetPath); + LogDebug("widgetSource " << widgetPath); } ConfigureResult JobWidgetInstall::ConfigureInstallation( @@ -521,7 +521,7 @@ ConfigureResult JobWidgetInstall::ConfigureInstallation( bool JobWidgetInstall::validateTizenApplicationID( const WrtDB::TizenAppId &tizenAppId) { - LogInfo("tizen application ID = [" << tizenAppId << "]"); + LogDebug("tizen application ID = [" << tizenAppId << "]"); regex_t reg; if (regcomp(®, REG_TIZENID_PATTERN, REG_NOSUB | REG_EXTENDED) != 0) { @@ -562,9 +562,9 @@ ConfigureResult JobWidgetInstall::checkWidgetUpdate( return ConfigureResult::Failed; } - LogInfo("existing version = '" << update.existingVersion); - LogInfo("incoming version = '" << update.incomingVersion); - LogInfo("Tizen AppID = " << update.tzAppId); + LogDebug("existing version = '" << update.existingVersion); + LogDebug("incoming version = '" << update.incomingVersion); + LogDebug("Tizen AppID = " << update.tzAppId); // Check running state bool isRunning = false; @@ -620,7 +620,7 @@ ConfigureResult JobWidgetInstall::checkWidgetUpdate( LogError("Fail to terminate running application"); return ConfigureResult::Failed_WidgetRunning; } - LogInfo("terminate application"); + LogDebug("terminate application"); } } @@ -706,7 +706,7 @@ WidgetUpdateInfo JobWidgetInstall::detectWidgetUpdate( const ConfigParserData &configInfo, const WrtDB::TizenAppId &tizenId) { - LogInfo("Checking up widget package for config.xml..."); + LogDebug("Checking up widget package for config.xml..."); OptionalWidgetVersion incomingVersion; if (!configInfo.version.IsNull()) { @@ -890,7 +890,7 @@ void JobWidgetInstall::displayWidgetInfo() out << std::endl; - LogInfo(out.str()); + LogDebug(out.str()); } WrtDB::PackagingType JobWidgetInstall::checkPackageType( @@ -898,7 +898,7 @@ WrtDB::PackagingType JobWidgetInstall::checkPackageType( const std::string &tempPath) { if (hasExtension(widgetSource, XML_EXTENSION)) { - LogInfo("Hosted app installation"); + LogDebug("Hosted app installation"); return PKG_TYPE_HOSTED_WEB_APP; } @@ -915,7 +915,7 @@ void JobWidgetInstall::setApplicationType( { AppType widgetAppType = APP_TYPE_UNKNOWN; FOREACH(iterator, configInfo.nameSpaces) { - LogInfo("namespace = [" << *iterator << "]"); + LogDebug("namespace = [" << *iterator << "]"); if (*iterator == ConfigurationNamespace::TizenWebAppNamespaceName) { if (widgetAppType != APP_TYPE_UNKNOWN && @@ -933,7 +933,7 @@ void JobWidgetInstall::setApplicationType( m_installerContext.widgetConfig.webAppType = widgetAppType; - LogInfo("type = [" << + LogDebug("type = [" << m_installerContext.widgetConfig.webAppType.getApptypeToString() << "]"); } diff --git a/src/jobs/widget_install/task_ace_check.cpp b/src/jobs/widget_install/task_ace_check.cpp index b3d7e4a..a75773b 100644 --- a/src/jobs/widget_install/task_ace_check.cpp +++ b/src/jobs/widget_install/task_ace_check.cpp @@ -60,17 +60,17 @@ void TaskAceCheck::StepPrepareForAce() void TaskAceCheck::StepAceCheck() { WrtDB::WidgetDAO dao(m_context.widgetConfig.tzAppid); - LogInfo("StepAceCheck!"); + LogDebug("StepAceCheck!"); // This widget does not use any device cap if (m_context.featureLogic->isDone()) { return; } - LogInfo("StepAceCheck!"); + LogDebug("StepAceCheck!"); DPL::String deviceCap = m_context.featureLogic->getDevice(); - LogInfo("StepAceCheck!"); - LogInfo("DevCap is : " << deviceCap); + LogDebug("StepAceCheck!"); + LogDebug("DevCap is : " << deviceCap); std::string devCapStr = DPL::ToUTF8String(deviceCap); ace_policy_result_t policyResult = ACE_DENY; @@ -90,7 +90,7 @@ void TaskAceCheck::StepAceCheck() } } - LogInfo("PolicyResult is : " << static_cast(policyResult)); + LogDebug("PolicyResult is : " << static_cast(policyResult)); m_context.staticPermittedDevCaps.insert(std::make_pair(deviceCap, policyResult == ACE_PERMIT)); @@ -107,18 +107,18 @@ void TaskAceCheck::StepProcessAceResponse() return; } - LogInfo("StepProcessAceResponse"); + LogDebug("StepProcessAceResponse"); m_context.featureLogic->next(); // No device caps left to process if (m_context.featureLogic->isDone()) { - LogInfo("All responses has been received from ACE."); + LogDebug("All responses has been received from ACE."); // Data to convert to C API std::vector devCaps; std::vector devCapsSmack; // Saving static dev cap permissions FOREACH(cap, m_context.staticPermittedDevCaps) { - LogInfo("staticPermittedDevCaps : " << cap->first + LogDebug("staticPermittedDevCaps : " << cap->first << " smack: " << cap->second); std::string devCapStr = DPL::ToUTF8String(cap->first); devCaps.push_back(devCapStr); @@ -176,14 +176,14 @@ void TaskAceCheck::StepProcessAceResponse() return; } - LogInfo("Next device cap."); + LogDebug("Next device cap."); // Process next device cap SwitchToStep(&TaskAceCheck::StepAceCheck); } void TaskAceCheck::StepCheckAceResponse() { - LogInfo("Checking ACE response"); + LogDebug("Checking ACE response"); if (m_context.featureLogic->isRejected()) { LogError("Installation failure. Some devCap was not accepted by ACE."); ThrowMsg( @@ -191,11 +191,11 @@ void TaskAceCheck::StepCheckAceResponse() "Instalation failure. " "Some deviceCap was not accepted by ACE."); } - LogInfo("Updating \"feature reject status\" in database!"); + LogDebug("Updating \"feature reject status\" in database!"); auto it = m_context.featureLogic->resultBegin(); auto end = m_context.featureLogic->resultEnd(); for (; it != end; ++it) { - LogInfo( + LogDebug( " |- Feature: " << it->name << " has reject status: " << it->rejected); if (it->rejected) { @@ -203,7 +203,7 @@ void TaskAceCheck::StepCheckAceResponse() dao.updateFeatureRejectStatus(*it); } } - LogInfo("Installation continues..."); + LogDebug("Installation continues..."); m_context.job->UpdateProgress( InstallerContext::INSTALL_ACE_CHECK, diff --git a/src/jobs/widget_install/task_certify.cpp b/src/jobs/widget_install/task_certify.cpp index a440a6d..7b44f7f 100644 --- a/src/jobs/widget_install/task_certify.cpp +++ b/src/jobs/widget_install/task_certify.cpp @@ -162,7 +162,7 @@ void TaskCertify::processDistributorSignature(const SignatureData &data) void TaskCertify::processAuthorSignature(const SignatureData &data) { using namespace ValidationCore; - LogInfo("DNS Identity match!"); + LogDebug("DNS Identity match!"); // this signature is verified or widget is distributor signed m_contextData.widgetSecurity.setAuthorCertificatePtr(data.getEndEntityCertificatePtr()); CertificatePtr test = m_contextData.widgetSecurity.getAuthorCertificatePtr(); @@ -211,7 +211,7 @@ void TaskCertify::getSignatureFiles(std::string path, SignatureFileInfoSet& file void TaskCertify::stepSignature() { - LogInfo("================ Step: <> ENTER ==============="); + LogDebug("================ Step: <> ENTER ==============="); std::string widgetPath; widgetPath = m_contextData.locations->getTemporaryPackageDir() + "/"; @@ -239,10 +239,10 @@ void TaskCertify::stepSignature() } SignatureFileInfoSet::reverse_iterator iter = signatureFiles.rbegin(); - LogInfo("Number of signatures: " << signatureFiles.size()); + LogDebug("Number of signatures: " << signatureFiles.size()); for (; iter != signatureFiles.rend(); ++iter) { - LogInfo("Checking signature with id=" << iter->getFileNumber()); + LogDebug("Checking signature with id=" << iter->getFileNumber()); SignatureData data(widgetPath + iter->getFileName(), iter->getFileNumber()); @@ -300,10 +300,10 @@ void TaskCertify::stepSignature() } if (signatureFiles.empty()) { - LogInfo("No signature files has been found."); + LogDebug("No signature files has been found."); } - LogInfo("================ Step: <> DONE ================"); + LogDebug("================ Step: <> DONE ================"); m_contextData.job->UpdateProgress( InstallerContext::INSTALL_DIGSIG_CHECK, @@ -312,7 +312,7 @@ void TaskCertify::stepSignature() void TaskCertify::stepFinalize() { - LogInfo("Step: <>"); + LogDebug("Step: <>"); m_contextData.job->UpdateProgress( InstallerContext::INSTALL_CERT_CHECK, @@ -333,7 +333,7 @@ bool TaskCertify::isTizenWebApp() const void TaskCertify::stepVerifyUpdate() { - LogInfo("Step: <>"); + LogDebug("Step: <>"); CertificatePtr newCertificate = m_contextData.widgetSecurity.getAuthorCertificatePtr(); CertificatePtr oldCertificate = diff --git a/src/jobs/widget_install/task_commons.cpp b/src/jobs/widget_install/task_commons.cpp index cd643ec..3935cfb 100644 --- a/src/jobs/widget_install/task_commons.cpp +++ b/src/jobs/widget_install/task_commons.cpp @@ -41,7 +41,7 @@ const mode_t TEMPORARY_PATH_MODE = 0775; std::string createTempPath(bool preload) { - LogInfo("Step: Creating temporary path"); + LogDebug("Step: Creating temporary path"); // Temporary path std::ostringstream tempPathBuilder; diff --git a/src/jobs/widget_install/task_database.cpp b/src/jobs/widget_install/task_database.cpp index 26b82a1..de10e4a 100644 --- a/src/jobs/widget_install/task_database.cpp +++ b/src/jobs/widget_install/task_database.cpp @@ -73,7 +73,7 @@ void TaskDatabase::StepWrtDBInsert() time(&m_context.widgetConfig.installedTime); if (m_context.isUpdateMode) { //update - LogInfo("Registering widget... (update)"); + LogDebug("Registering widget... (update)"); Try { m_handleToRemove = WidgetDAOReadOnly::getHandle( @@ -100,7 +100,7 @@ void TaskDatabase::StepWrtDBInsert() m_handle = WidgetDAOReadOnly::getHandle( m_context.widgetConfig.tzAppid); } else { //new installation - LogInfo("Registering widget..."); + LogDebug("Registering widget..."); WidgetDAO::registerWidget( m_context.widgetConfig.tzAppid, m_context.widgetConfig, @@ -110,13 +110,13 @@ void TaskDatabase::StepWrtDBInsert() } FOREACH(cap, m_context.staticPermittedDevCaps) { - LogInfo( + LogDebug( "staticPermittedDevCaps : " << cap->first << " smack status: " << cap->second); } - LogInfo("Widget registered"); + LogDebug("Widget registered"); } Catch(WidgetDAO::Exception::DatabaseError) { @@ -302,17 +302,17 @@ void TaskDatabase::StepLiveboxDBInsert() } else { boxType = DPL::ToUTF8String((**it).m_type); } - LogInfo("livebox id: " << boxId); - LogInfo("livebox type: " << boxType); + LogDebug("livebox id: " << boxId); + LogDebug("livebox type: " << boxType); int autoLaunch = (**it).m_autoLaunch == L"true" ? 1 : 0; - LogInfo("livebox auto-launch: " << autoLaunch); + LogDebug("livebox auto-launch: " << autoLaunch); int mouseEvent = (**it).m_boxInfo.m_boxMouseEvent == L"true" ? 1 : 0; - LogInfo("livebox mouse-event: " << mouseEvent); + LogDebug("livebox mouse-event: " << mouseEvent); int pdFastOpen = (**it).m_boxInfo.m_pdFastOpen == L"true" ? 1 : 0; - LogInfo("livebox pd fast-open: " << pdFastOpen); + LogDebug("livebox pd fast-open: " << pdFastOpen); web_provider_livebox_insert_box_info( boxId.c_str(), tizenId.c_str(), boxType.c_str(), diff --git a/src/jobs/widget_install/task_file_manipulation.cpp b/src/jobs/widget_install/task_file_manipulation.cpp index 181e85e..866d189 100644 --- a/src/jobs/widget_install/task_file_manipulation.cpp +++ b/src/jobs/widget_install/task_file_manipulation.cpp @@ -118,7 +118,7 @@ void changeOwnerForDirectory(std::string storagePath, mode_t mode) { "Chown to invaild user"); } } else if (euidaccess(storagePath.c_str(), W_OK | R_OK | X_OK) == 0) { - LogInfo(storagePath << " already exists."); + LogDebug(storagePath << " already exists."); // Even if private directory already is created, private dircetory // should change owner. if (chown(storagePath.c_str(), diff --git a/src/jobs/widget_install/task_install_ospsvc.cpp b/src/jobs/widget_install/task_install_ospsvc.cpp index b3e3374..3c3fb94 100644 --- a/src/jobs/widget_install/task_install_ospsvc.cpp +++ b/src/jobs/widget_install/task_install_ospsvc.cpp @@ -56,7 +56,7 @@ TaskInstallOspsvc::TaskInstallOspsvc(InstallerContext& context) : void TaskInstallOspsvc::StepInstallOspService() { - LogInfo("Step: installation for osp service"); + LogDebug("Step: installation for osp service"); std::ostringstream commStr; commStr << OSP_INSTALL_STR << BashUtils::escape_arg( diff --git a/src/jobs/widget_install/task_manifest_file.cpp b/src/jobs/widget_install/task_manifest_file.cpp old mode 100755 new mode 100644 index a94bf6a..ccd79c7 --- a/src/jobs/widget_install/task_manifest_file.cpp +++ b/src/jobs/widget_install/task_manifest_file.cpp @@ -179,7 +179,7 @@ void TaskManifestFile::stepCreateExecFile() } #else //default widget - LogInfo("link -s " << clientExeStr << " " << exec); + LogDebug("link -s " << clientExeStr << " " << exec); errno = 0; if (symlink(clientExeStr.c_str(), exec.c_str()) != 0) { @@ -489,7 +489,7 @@ void TaskManifestFile::saveLocalizedKey(std::ofstream &file, void TaskManifestFile::backupIconFiles() { - LogInfo("Backup Icon Files"); + LogDebug("Backup Icon Files"); std::ostringstream b_icon_dir; b_icon_dir << backup_dir.str() << "icons"; @@ -654,7 +654,7 @@ void TaskManifestFile::commitManifest() if (!(m_context.mode.rootPath == InstallMode::RootPath::RO && m_context.mode.installTime == InstallMode::InstallTime::PRELOAD && m_context.mode.extension == InstallMode::ExtensionType::DIR)) { - LogInfo("cp " << manifest_file << " " << commit_manifest); + LogDebug("cp " << manifest_file << " " << commit_manifest); DPL::FileInput input(DPL::ToUTF8String(manifest_file)); DPL::FileOutput output(commit_manifest); @@ -985,7 +985,7 @@ void TaskManifestFile::setAppControlsInfo(UiApplication & uiApp) m_context.widgetConfig.configInfo.appControlList; if (appControlList.empty()) { - LogInfo("Widget doesn't contain app control"); + LogDebug("Widget doesn't contain app control"); return; } @@ -1022,7 +1022,7 @@ void TaskManifestFile::setAppCategory(UiApplication &uiApp) m_context.widgetConfig.configInfo.categoryList; if (categoryList.empty()) { - LogInfo("Widget doesn't contain application category"); + LogDebug("Widget doesn't contain application category"); return; } FOREACH(it, categoryList) { @@ -1038,7 +1038,7 @@ void TaskManifestFile::setMetadata(UiApplication &uiApp) m_context.widgetConfig.configInfo.metadataList; if (metadataList.empty()) { - LogInfo("Web application doesn't contain metadata"); + LogDebug("Web application doesn't contain metadata"); return; } FOREACH(it, metadataList) { @@ -1067,7 +1067,7 @@ void TaskManifestFile::stepAbortParseManifest() void TaskManifestFile::setLiveBoxInfo(Manifest& manifest) { FOREACH(it, m_context.widgetConfig.configInfo.m_livebox) { - LogInfo("setLiveBoxInfo"); + LogDebug("setLiveBoxInfo"); LiveBoxInfo liveBox; DPL::Optional ConfigInfo = *it; DPL::String appid = m_context.widgetConfig.tzAppid; @@ -1129,7 +1129,7 @@ void TaskManifestFile::setLiveBoxInfo(Manifest& manifest) if (ConfigInfo->m_boxInfo.m_boxSrc.empty() || ConfigInfo->m_boxInfo.m_boxSize.empty()) { - LogInfo("Widget doesn't contain box"); + LogDebug("Widget doesn't contain box"); return; } else { BoxInfoType box; @@ -1212,7 +1212,7 @@ void TaskManifestFile::setAccount(Manifest& manifest) AccountProviderType provider; if (account.m_iconSet.empty()) { - LogInfo("Widget doesn't contain Account"); + LogDebug("Widget doesn't contain Account"); return; } if (account.m_multiAccountSupport) { diff --git a/src/jobs/widget_install/task_prepare_reinstall.cpp b/src/jobs/widget_install/task_prepare_reinstall.cpp index 772375a..4eb4f3d 100644 --- a/src/jobs/widget_install/task_prepare_reinstall.cpp +++ b/src/jobs/widget_install/task_prepare_reinstall.cpp @@ -65,7 +65,7 @@ TaskPrepareReinstall::TaskPrepareReinstall(InstallerContext& context) : void TaskPrepareReinstall::StepPrepare() { - LogInfo("Prepare"); + LogDebug("Prepare"); m_sourcePath = m_context.locations->getTemporaryPackageDir(); m_sourcePath += "/"; @@ -75,7 +75,7 @@ void TaskPrepareReinstall::StepPrepare() void TaskPrepareReinstall::StepParseRDSDelta() { - LogInfo("parse RDS delta"); + LogDebug("parse RDS delta"); std::string rdsDeltaPath = m_sourcePath; rdsDeltaPath += ".rds_delta"; std::ifstream delta(rdsDeltaPath); @@ -91,7 +91,7 @@ void TaskPrepareReinstall::StepParseRDSDelta() while (std::getline(delta, line) &&!delta.eof()) { FOREACH(keyIt, keyList) { if (line == *keyIt) { - LogInfo("find key = [" << line << "]"); + LogDebug("find key = [" << line << "]"); key = line; break; } @@ -101,20 +101,20 @@ void TaskPrepareReinstall::StepParseRDSDelta() } if (key == KEY_DELETE) { m_deleteFileList.push_back(line); - LogInfo("line = [" << line << "]"); + LogDebug("line = [" << line << "]"); } else if (key == KEY_ADD) { m_addFileList.push_back(line); - LogInfo("line = [" << line << "]"); + LogDebug("line = [" << line << "]"); } else if (key == KEY_MODIFY) { m_modifyFileList.push_back(line); - LogInfo("line = [" << line << "]"); + LogDebug("line = [" << line << "]"); } } } void TaskPrepareReinstall::StepVerifyRDSDelta() { - LogInfo("verify RDS delta"); + LogDebug("verify RDS delta"); // Verify ADD file FOREACH(file, m_addFileList) { std::string addFilePath = m_sourcePath; @@ -137,7 +137,7 @@ void TaskPrepareReinstall::StepVerifyRDSDelta() existingFilePath += *file; verifyFile(existingFilePath); } - LogInfo("Finished veify RDS Delta"); + LogDebug("Finished veify RDS Delta"); m_context.job->UpdateProgress( InstallerContext::INSTALL_RDS_DELTA_CHECK, @@ -146,7 +146,7 @@ void TaskPrepareReinstall::StepVerifyRDSDelta() void TaskPrepareReinstall::StepAddFile() { - LogInfo("Add file"); + LogDebug("Add file"); FOREACH(file, m_addFileList) { std::string newfile = m_sourcePath; newfile += *file; @@ -156,13 +156,13 @@ void TaskPrepareReinstall::StepAddFile() ThrowMsg(Exceptions::RDSDeltaFailure, "Fail to ADD file " << newfile); } - LogInfo("Copy " << newfile << " to " << destPath); + LogDebug("Copy " << newfile << " to " << destPath); } } void TaskPrepareReinstall::StepDeleteFile() { - LogInfo("Delete file"); + LogDebug("Delete file"); FOREACH(file, m_deleteFileList) { std::string deleteFilePath = m_installedPath; deleteFilePath += *file; @@ -170,13 +170,13 @@ void TaskPrepareReinstall::StepDeleteFile() ThrowMsg(Exceptions::RDSDeltaFailure, "Fail to DELETE file " << deleteFilePath); } - LogInfo("Delete " << deleteFilePath); + LogDebug("Delete " << deleteFilePath); } } void TaskPrepareReinstall::StepModifyFile() { - LogInfo("Modify file"); + LogDebug("Modify file"); FOREACH(file, m_modifyFileList) { std::string destPath = m_installedPath; destPath += *file; @@ -191,7 +191,7 @@ void TaskPrepareReinstall::StepModifyFile() ThrowMsg(Exceptions::RDSDeltaFailure, "Fail to move new file" << destPath); } - LogInfo("Replace " << newfile << " to " << destPath); + LogDebug("Replace " << newfile << " to " << destPath); } m_context.job->UpdateProgress( InstallerContext::INSTALL_RDS_PREPARE, diff --git a/src/jobs/widget_install/task_recovery.cpp b/src/jobs/widget_install/task_recovery.cpp index 6e963b8..09b0e7d 100644 --- a/src/jobs/widget_install/task_recovery.cpp +++ b/src/jobs/widget_install/task_recovery.cpp @@ -52,7 +52,7 @@ TaskRecovery::TaskRecovery(InstallerContext& context) : void TaskRecovery::StepCreateCheckFile() { - LogInfo("Step: create information file for recovery"); + LogDebug("Step: create information file for recovery"); size_t pos = m_context.locations->getWidgetSource().rfind("/"); std::ostringstream infoPath; diff --git a/src/jobs/widget_install/task_smack.cpp b/src/jobs/widget_install/task_smack.cpp index 73272db..65a97cb 100644 --- a/src/jobs/widget_install/task_smack.cpp +++ b/src/jobs/widget_install/task_smack.cpp @@ -67,7 +67,7 @@ TaskSmack::TaskSmack(InstallerContext& context) : void TaskSmack::StepSetInstall() { - LogInfo("----------------> SMACK: StepStartSetSmack()"); + LogDebug("----------------> SMACK: StepStartSetSmack()"); #ifdef WRT_SMACK_ENABLED std::string pkg = DPL::ToUTF8String(m_context.widgetConfig.tzPkgid); m_pkgId = (char*)calloc(1, pkg.length() + 1); @@ -87,7 +87,7 @@ void TaskSmack::StepSetInstall() void TaskSmack::StepSmackFolderLabeling() { - LogInfo("----------------> SMACK:\ + LogDebug("----------------> SMACK:\ Jobs::WidgetInstall::TaskSmack::SmackFolderLabelingStep()"); #ifdef WRT_SMACK_ENABLED /* /opt/usr/apps/[pkgid] directory's label is "_" */ @@ -151,7 +151,7 @@ void TaskSmack::StepSmackFolderLabeling() void TaskSmack::StepSmackPrivilege() { - LogInfo("----------------> SMACK:\ + LogDebug("----------------> SMACK:\ Jobs::WidgetInstall::TaskSmack::SmackPrivilegeStep()"); #ifdef WRT_SMACK_ENABLED /* TODO : @@ -168,7 +168,7 @@ void TaskSmack::StepSmackPrivilege() char** perm_list = new char*[privileges.size() + 1]; int index = 0; FOREACH(it, privileges) { - LogInfo("Permission : " << it->name); + LogDebug("Permission : " << it->name); int length = DPL::ToUTF8String(it->name).length(); char *priv = new char[length + 1]; snprintf(priv, length + 1, "%s", @@ -197,7 +197,7 @@ void TaskSmack::StepSmackPrivilege() void TaskSmack::StepRevokeForUpdate() { - LogInfo("----------------> SMACK:\ + LogDebug("----------------> SMACK:\ Jobs::WidgetInstall::TaskSmack::StepRevokePrivilegeForUpdate()"); #ifdef WRT_SMACK_ENABLED if (PC_OPERATION_SUCCESS != app_revoke_permissions(m_pkgId)) { @@ -208,7 +208,7 @@ void TaskSmack::StepRevokeForUpdate() void TaskSmack::StepAbortSmack() { - LogInfo("----------------> SMACK:\ + LogDebug("----------------> SMACK:\ Jobs::WidgetInstall::TaskSmack::StepAbortSmack()"); #ifdef WRT_SMACK_ENABLED diff --git a/src/jobs/widget_install/task_widget_config.cpp b/src/jobs/widget_install/task_widget_config.cpp index 758535d..936e912 100644 --- a/src/jobs/widget_install/task_widget_config.cpp +++ b/src/jobs/widget_install/task_widget_config.cpp @@ -94,7 +94,7 @@ void TaskWidgetConfig::StepProcessConfigurationFile() Try { std::string path = m_installContext.locations->getConfigurationDir(); - LogInfo("path: " << path); + LogDebug("path: " << path); processFile(path, m_installContext.widgetConfig); } @@ -309,7 +309,7 @@ void TaskWidgetConfig::ProcessLocalizedIcons() void TaskWidgetConfig::ProcessIcon(const WrtDB::ConfigParserData::Icon& icon) { - LogInfo("enter"); + LogDebug("enter"); bool isAnyIconValid = false; //In case a default filename is passed as custom filename in config.xml, we //need to keep a set of already processed filenames to avoid icon @@ -343,7 +343,7 @@ void TaskWidgetConfig::ProcessIcon(const WrtDB::ConfigParserData::Icon& icon) if (MimeTypeUtils::isMimeTypeSupportedForIcon(type)) { isAnyIconValid = true; localesAvailableForIcon.insert(*i); - LogInfo("Icon absolutePath :" << absolutePath << + LogDebug("Icon absolutePath :" << absolutePath << ", assigned locale :" << *i << ", type: " << type); } } @@ -502,7 +502,7 @@ void TaskWidgetConfig::StepVerifyFeatures() if (!isFeatureAllowed(m_installContext.widgetConfig.webAppType.appType, it->name)) { - LogInfo("This application type not allowed to use this feature"); + LogDebug("This application type not allowed to use this feature"); ThrowMsg( Exceptions::WidgetConfigFileInvalid, "This app type [" << @@ -549,7 +549,7 @@ void TaskWidgetConfig::StepVerifyLivebox() boxType = DPL::ToUTF8String((**it).m_type); } - LogInfo("livebox type: " << boxType); + LogDebug("livebox type: " << boxType); ConfigParserData::LiveboxInfo::BoxSizeList boxSizeList = (**it).m_boxInfo.m_boxSize; @@ -580,9 +580,9 @@ bool TaskWidgetConfig::isFeatureAllowed(WrtDB::AppType appType, DPL::String featureName) { using namespace WrtDB; - LogInfo("AppType = [" << + LogDebug("AppType = [" << WidgetType(appType).getApptypeToString() << "]"); - LogInfo("FetureName = [" << featureName << "]"); + LogDebug("FetureName = [" << featureName << "]"); AppType featureType = APP_TYPE_UNKNOWN; std::string featureStr = DPL::ToUTF8String(featureName); @@ -679,7 +679,7 @@ bool TaskWidgetConfig::isMinVersionCompatible( (majorWidget == majorSupported && minorWidget == minorSupported && microWidget > microSupported)) { - LogInfo("Platform doesn't support this widget."); + LogDebug("Platform doesn't support this widget."); return false; } return true; diff --git a/src/jobs/widget_install/widget_unzip.cpp b/src/jobs/widget_install/widget_unzip.cpp index 95f3ab4..28ef7b2 100644 --- a/src/jobs/widget_install/widget_unzip.cpp +++ b/src/jobs/widget_install/widget_unzip.cpp @@ -90,7 +90,7 @@ void WidgetUnzip::ExtractFile(DPL::ZipInput::File *input, void WidgetUnzip::unzipProgress(const std::string &destination) { // Show file info - LogInfo("Unzipping: '" << m_zipIterator->name << + LogDebug("Unzipping: '" << m_zipIterator->name << "', Comment: '" << m_zipIterator->comment << "', Compressed size: " << m_zipIterator->compressedSize << ", Uncompressed size: " << m_zipIterator->uncompressedSize); @@ -142,7 +142,7 @@ void WidgetUnzip::unzipProgress(const std::string &destination) // Check whether there are more files to extract if (++m_zipIterator == m_zip->end()) { - LogInfo("Unzip progress finished successfuly"); + LogDebug("Unzip progress finished successfuly"); } else { unzipProgress(destination); } @@ -174,10 +174,10 @@ bool WidgetUnzip::isDRMPackage(const std::string &source) ret = drm_oem_sapps_is_drm_file(source.c_str(), source.length()); dlclose(pHandle); if (1 == ret) { - LogInfo(source << " is DRM file"); + LogDebug(source << " is DRM file"); return true; } - LogInfo(source << " isn't DRM file"); + LogDebug(source << " isn't DRM file"); return false; } @@ -211,7 +211,7 @@ bool WidgetUnzip::decryptDRMPackage(const std::string &source, const std::string decryptedSource.c_str(), decryptedSource.length()); dlclose(pHandle); if (1 == ret) { - LogInfo(source << " is decrypted : " << decryptedSource); + LogDebug(source << " is decrypted : " << decryptedSource); return true; } return false; @@ -219,7 +219,7 @@ bool WidgetUnzip::decryptDRMPackage(const std::string &source, const std::string std::string WidgetUnzip::getDecryptedPackage(const std::string &source) { - LogInfo("Check DRM..."); + LogDebug("Check DRM..."); if (isDRMPackage(source)) { std::string decryptedFile; size_t found = source.find_last_of(".wgt"); @@ -242,7 +242,7 @@ std::string WidgetUnzip::getDecryptedPackage(const std::string &source) void WidgetUnzip::unzipWgtFile(const std::string &source, const std::string &destination) { - LogInfo("Prepare to unzip..."); + LogDebug("Prepare to unzip..."); std::string wgtFile; Try { @@ -250,7 +250,7 @@ void WidgetUnzip::unzipWgtFile(const std::string &source, const std::string &des LogDebug("wgtFile : " << wgtFile); m_zip.reset(new DPL::ZipInput(wgtFile)); - LogInfo("Widget package comment: " << m_zip->GetGlobalComment()); + LogDebug("Widget package comment: " << m_zip->GetGlobalComment()); // Widget package must not be empty if (m_zip->empty()) { @@ -266,7 +266,7 @@ void WidgetUnzip::unzipWgtFile(const std::string &source, const std::string &des m_zip.reset(); // Done - LogInfo("Unzip finished"); + LogDebug("Unzip finished"); } Catch(DPL::ZipInput::Exception::OpenFailed) { diff --git a/src/jobs/widget_uninstall/job_widget_uninstall.cpp b/src/jobs/widget_uninstall/job_widget_uninstall.cpp index 70c6340..b5e978e 100644 --- a/src/jobs/widget_uninstall/job_widget_uninstall.cpp +++ b/src/jobs/widget_uninstall/job_widget_uninstall.cpp @@ -103,7 +103,7 @@ JobWidgetUninstall::JobWidgetUninstall( m_context.installedPath = DPL::Utils::Path(*dao.getWidgetInstalledPath()); - LogInfo("Widget model exists. App id : " << m_context.tzAppid); + LogDebug("Widget model exists. App id : " << m_context.tzAppid); AddTask(new TaskSmack(m_context)); AddTask(new TaskCheck(m_context)); diff --git a/src/jobs/widget_uninstall/task_check.cpp b/src/jobs/widget_uninstall/task_check.cpp index abe6fd2..49acac6 100644 --- a/src/jobs/widget_uninstall/task_check.cpp +++ b/src/jobs/widget_uninstall/task_check.cpp @@ -93,11 +93,11 @@ void TaskCheck::StepUninstallPreCheck() ThrowMsg(Exceptions::AppIsRunning, "Widget is not stopped. Cannot uninstall!"); } - LogInfo("terminate application"); + LogDebug("terminate application"); } } - LogInfo("Widget Can be uninstalled. Pkgname : " << m_context.tzAppid); + LogDebug("Widget Can be uninstalled. Pkgname : " << m_context.tzAppid); m_context.job->UpdateProgress(UninstallerContext::UNINSTALL_PRECHECK, "Uninstall pre-checking Finished"); } diff --git a/src/jobs/widget_uninstall/task_db_update.cpp b/src/jobs/widget_uninstall/task_db_update.cpp index 9047aae..de9c15c 100644 --- a/src/jobs/widget_uninstall/task_db_update.cpp +++ b/src/jobs/widget_uninstall/task_db_update.cpp @@ -78,7 +78,7 @@ void TaskDbUpdate::StepLiveboxDBDelete() if (ret < 0) { LogDebug("failed to delete box info"); } else { - LogInfo("delete box info: " << m_context.tzAppid); + LogDebug("delete box info: " << m_context.tzAppid); } } } //namespace WidgetUninstall diff --git a/src/jobs/widget_uninstall/task_remove_files.cpp b/src/jobs/widget_uninstall/task_remove_files.cpp index 911b1bd..2940e19 100644 --- a/src/jobs/widget_uninstall/task_remove_files.cpp +++ b/src/jobs/widget_uninstall/task_remove_files.cpp @@ -56,7 +56,7 @@ TaskRemoveFiles::~TaskRemoveFiles() void TaskRemoveFiles::StepRemoveInstallationDirectory() { - LogInfo("StepRemoveInstallationDirectory started"); + LogDebug("StepRemoveInstallationDirectory started"); Try { int ret = app2ext_get_app_location(m_context.tzPkgid.c_str()); @@ -102,7 +102,7 @@ void TaskRemoveFiles::StepRemoveInstallationDirectory() void TaskRemoveFiles::StepRemoveFinished() { - LogInfo("StepRemoveFinished finished"); + LogDebug("StepRemoveFinished finished"); m_context.job->UpdateProgress( UninstallerContext::UNINSTALL_REMOVE_FINISHED, diff --git a/src/jobs/widget_uninstall/task_smack.cpp b/src/jobs/widget_uninstall/task_smack.cpp index 4e7d467..084722e 100644 --- a/src/jobs/widget_uninstall/task_smack.cpp +++ b/src/jobs/widget_uninstall/task_smack.cpp @@ -40,7 +40,7 @@ TaskSmack::TaskSmack(UninstallerContext& context) : void TaskSmack::Step() { - LogInfo( + LogDebug( "------------------------> SMACK: Jobs::WidgetUninstall::TaskSmack::Step()"); #ifdef WRT_SMACK_ENABLED const char* pkgId = m_context.tzPkgid.c_str(); diff --git a/src/jobs/widget_uninstall/task_uninstall_ospsvc.cpp b/src/jobs/widget_uninstall/task_uninstall_ospsvc.cpp index 572b130..c476ab2 100644 --- a/src/jobs/widget_uninstall/task_uninstall_ospsvc.cpp +++ b/src/jobs/widget_uninstall/task_uninstall_ospsvc.cpp @@ -49,7 +49,7 @@ TaskUninstallOspsvc::~TaskUninstallOspsvc() void TaskUninstallOspsvc::StepUninstallOspsvc() { - LogInfo("Step : Uninstall Osp service "); + LogDebug("Step : Uninstall Osp service "); std::ostringstream commStr; commStr << OSP_INSTALL_STR << BashUtils::escape_arg(m_context.tzPkgid); @@ -84,7 +84,7 @@ void TaskUninstallOspsvc::StepUninstallOspsvc() pclose(fd); - LogInfo("Widget Can be uninstalled. Pkgname : " << m_context.tzPkgid); + LogDebug("Widget Can be uninstalled. Pkgname : " << m_context.tzPkgid); m_context.job->UpdateProgress(UninstallerContext::UNINSTALL_REMOVE_OSPSVC, "Uninstall OSP service finished"); } diff --git a/src/logic/installer_logic.cpp b/src/logic/installer_logic.cpp index 6b3f06c..a151125 100644 --- a/src/logic/installer_logic.cpp +++ b/src/logic/installer_logic.cpp @@ -171,7 +171,7 @@ bool InstallerLogic::NextStep(Jobs::Job *job) return false; } catch (Jobs::JobExceptionBase &exc) { //start revert job - LogInfo("Exception occured: " << exc.getParam() << + LogDebug("Exception occured: " << exc.getParam() << ". Reverting job..."); bool hasAbortSteps = job->Abort(); job->SetUndoType(true); diff --git a/src/misc/feature_logic.cpp b/src/misc/feature_logic.cpp index 6ae087e..7f928ef 100644 --- a/src/misc/feature_logic.cpp +++ b/src/misc/feature_logic.cpp @@ -39,7 +39,7 @@ FeatureLogic::FeatureLogic(const WrtDB::TizenAppId & tzAppid) : WrtDB::WidgetDAOReadOnly widgetDao(tzAppid); WidgetFeatureSet featureSet = widgetDao.getFeaturesList(); FOREACH(it, featureSet) { - LogInfo("Feature name : " << it->name); + LogDebug("Feature name : " << it->name); WrtDB::DeviceCapabilitySet dcs; if (!DPL::StringCompare(it->name, PRIVILEGE_TESTAUTOMATION)) { // special privilege @@ -51,7 +51,7 @@ FeatureLogic::FeatureLogic(const WrtDB::TizenAppId & tzAppid) : dcs = WrtDB::GlobalDAOReadOnly::GetDeviceCapability(it->name); } FOREACH(devCap, dcs) { - LogInfo("--- dev cap : " << *devCap); + LogDebug("--- dev cap : " << *devCap); } Feature feature(*it, dcs); m_featureList.push_back(feature); diff --git a/src/pkg-manager/pkgmgr_signal.cpp b/src/pkg-manager/pkgmgr_signal.cpp index 5f43314..dc66308 100644 --- a/src/pkg-manager/pkgmgr_signal.cpp +++ b/src/pkg-manager/pkgmgr_signal.cpp @@ -36,7 +36,7 @@ PkgmgrSignal::~PkgmgrSignal() bool PkgmgrSignal::initialize(int argc, char* argv[]) { if (m_handle) { - LogInfo("Release already allocated pkgmgr handle"); + LogDebug("Release already allocated pkgmgr handle"); pkgmgr_installer_free(m_handle); m_handle = NULL; } @@ -99,7 +99,7 @@ bool PkgmgrSignal::setPkgname(const std::string& name) } m_pkgname = name; - LogInfo("Success to set tizen package name: " << m_pkgname); + LogDebug("Success to set tizen package name: " << m_pkgname); return true; } @@ -131,7 +131,7 @@ bool PkgmgrSignal::sendSignal(const std::string& key, return false; } - LogInfo("Success to send pkgmgr signal: " << key << + LogDebug("Success to send pkgmgr signal: " << key << " - " << value); return true; } diff --git a/src/wrt-installer/installer_callbacks_translate.cpp b/src/wrt-installer/installer_callbacks_translate.cpp index fa1c9f2..5e415d2 100644 --- a/src/wrt-installer/installer_callbacks_translate.cpp +++ b/src/wrt-installer/installer_callbacks_translate.cpp @@ -162,7 +162,7 @@ void installFinishedCallback(void *userParam, // Callback apiStr->status_callback(tizenId, errorStatus, apiStr->userdata); } else { - LogInfo("installFinishedCallback: No callback"); + LogDebug("installFinishedCallback: No callback"); } } @@ -201,7 +201,7 @@ void uninstallFinishedCallback(void *userParam, // Callback apiStr->status_callback(tizenId, errorStatus, apiStr->userdata); } else { - LogInfo("uninstallFinishedCallback: No callback"); + LogDebug("uninstallFinishedCallback: No callback"); } } @@ -231,7 +231,7 @@ void pluginInstallFinishedCallback(void *userParam, apiStr->statusCallback(errorStatus, apiStr->userdata); } else { - LogInfo("PluginInstallFinishedCallback: No callback"); + LogDebug("PluginInstallFinishedCallback: No callback"); } delete apiStr; @@ -249,12 +249,12 @@ void installProgressCallback(void *userParam, if (apiStr->progress_callback) { //CALLBACK EXEC - LogInfo("Entered " << percent << "% " << description); + LogDebug("Entered " << percent << "% " << description); apiStr->progress_callback(static_cast(percent), description.c_str(), apiStr->userdata); } else { - LogInfo("installProgressCallback: ignoring NULL callback pointer"); + LogDebug("installProgressCallback: ignoring NULL callback pointer"); } } } //namespace diff --git a/src/wrt-installer/plugin_utils.cpp b/src/wrt-installer/plugin_utils.cpp index 5368f3f..657f8dc 100644 --- a/src/wrt-installer/plugin_utils.cpp +++ b/src/wrt-installer/plugin_utils.cpp @@ -43,7 +43,7 @@ bool lockPluginInstallation(bool isPreload) int ret = 0; - LogInfo("Try to lock for plugins installation."); + LogDebug("Try to lock for plugins installation."); s_plugin_install_lock_fd = open(PLUGIN_INSTALL_LOCK_FILE, O_RDONLY | O_CREAT, 0666); @@ -70,7 +70,7 @@ bool lockPluginInstallation(bool isPreload) bool unlockPluginInstallation(bool isPreload) { - LogInfo("Unlock for plugins installation."); + LogDebug("Unlock for plugins installation."); if (isPreload) { fprintf(stderr, "Skip plugin unlock.. \n"); return true; diff --git a/src/wrt-installer/wrt-installer.cpp b/src/wrt-installer/wrt-installer.cpp index 13ddfe8..4121d93 100644 --- a/src/wrt-installer/wrt-installer.cpp +++ b/src/wrt-installer/wrt-installer.cpp @@ -111,12 +111,12 @@ int WrtInstaller::getReturnStatus() const void WrtInstaller::OnStop() { - LogInfo("Stopping Dummy Client"); + LogDebug("Stopping Dummy Client"); } void WrtInstaller::OnCreate() { - LogInfo("Creating DummyClient"); + LogDebug("Creating DummyClient"); fprintf(stderr, "===========================================================\n"); fprintf(stderr, "# wrt-installer #\n"); @@ -165,7 +165,7 @@ void WrtInstaller::OnCreate() if (!m_startupPluginInstallation) { AddStep(&WrtInstaller::installPluginsStep); } else { - LogInfo("Plugin installation alredy started"); + LogDebug("Plugin installation alredy started"); } } else if (arg == "-i" || arg == "--install") { if (m_argc != 3) { @@ -174,10 +174,10 @@ void WrtInstaller::OnCreate() struct stat info; if (-1 != stat(m_argv[2], &info) && S_ISDIR(info.st_mode)) { - LogInfo("Installing package directly from directory"); + LogDebug("Installing package directly from directory"); m_installMode.extension = InstallMode::ExtensionType::DIR; } else { - LogInfo("Installing from regular location"); + LogDebug("Installing from regular location"); m_installMode.extension = InstallMode::ExtensionType::WGT; } m_packagePath = m_argv[2]; @@ -269,7 +269,7 @@ void WrtInstaller::OnCreate() if (m_argc != 3) { return showHelpAndQuit(); } - LogInfo("Installing package directly from directory"); + LogDebug("Installing package directly from directory"); m_installMode.command = InstallMode::Command::REINSTALL; m_installMode.extension = InstallMode::ExtensionType::DIR; m_packagePath = m_argv[2]; @@ -297,10 +297,10 @@ void WrtInstaller::OnCreate() m_packagePath = m_argv[4]; struct stat info; if (-1 != stat(m_argv[4], &info) && S_ISDIR(info.st_mode)) { - LogInfo("Installing package directly from directory"); + LogDebug("Installing package directly from directory"); m_installMode.extension = InstallMode::ExtensionType::DIR; } else { - LogInfo("Installing from regular location"); + LogDebug("Installing from regular location"); m_installMode.extension = InstallMode::ExtensionType::WGT; } AddStep(&WrtInstaller::installStep); @@ -436,7 +436,7 @@ void WrtInstaller::installPluginsStep() fprintf(stderr, "Installing plugins ...\n"); if (m_startupPluginInstallation) { - LogInfo("Plugin installation started because new plugin package found"); + LogDebug("Plugin installation started because new plugin package found"); } else if (!PluginUtils::lockPluginInstallation( m_installMode.installTime == InstallMode::InstallTime::PRELOAD)) { @@ -456,7 +456,7 @@ void WrtInstaller::installPluginsStep() return; } - LogInfo("Plugin DIRECTORY IS" << PLUGIN_PATH); + LogDebug("Plugin DIRECTORY IS" << PLUGIN_PATH); std::list pluginsPaths; struct dirent libdir; @@ -499,7 +499,7 @@ void WrtInstaller::installPluginsStep() //set nb of plugins to install //this value indicate how many callbacks are expected m_numPluginsToInstall = pluginsPaths.size(); - LogInfo("Plugins to install: " << m_numPluginsToInstall); + LogDebug("Plugins to install: " << m_numPluginsToInstall); m_pluginsPaths = pluginsPaths; m_totalPlugins = m_numPluginsToInstall; @@ -976,14 +976,14 @@ void WrtInstaller::staticWrtPluginInstallationCallback(WrtErrStatus status, //remove installation request if (!PluginUtils::removeInstallationRequiredFlag()) { - LogInfo("Failed to remove file initializing plugin installation"); + LogDebug("Failed to remove file initializing plugin installation"); } //remove lock file if (!PluginUtils::unlockPluginInstallation( This->m_installMode.installTime == InstallMode::InstallTime::PRELOAD)) { - LogInfo("Failed to remove installation lock"); + LogDebug("Failed to remove installation lock"); } This->DPL::Event::ControllerEventHandler @@ -1029,7 +1029,7 @@ void WrtInstaller::staticWrtPluginInstallProgressCb(float percent, std::string path = std::string(data->pluginPath); - LogInfo("Plugin Installation: " << path << + LogDebug("Plugin Installation: " << path << " progress: " << percent << "description " << description); } @@ -1039,7 +1039,7 @@ void WrtInstaller::staticWrtInstallProgressCallback(float percent, void* /*userdata*/) { //WrtInstaller *This = static_cast(userdata); - LogInfo(" progress: " << percent << + LogDebug(" progress: " << percent << " description: " << description); } void WrtInstaller::staticWrtUninstallProgressCallback(float percent, @@ -1047,7 +1047,7 @@ void WrtInstaller::staticWrtUninstallProgressCallback(float percent, void* /*userdata*/) { //WrtInstaller *This = static_cast(userdata); - LogInfo(" progress: " << percent << + LogDebug(" progress: " << percent << " description: " << description); } @@ -1078,7 +1078,7 @@ void WrtInstaller::installNewPlugins() if (!PluginUtils::lockPluginInstallation( m_installMode.installTime == InstallMode::InstallTime::PRELOAD)) { - LogInfo("Lock NOT created"); + LogDebug("Lock NOT created"); return; } diff --git a/src/wrt-installer/wrt_installer_api.cpp b/src/wrt-installer/wrt_installer_api.cpp index ff19de7..c36917a 100644 --- a/src/wrt-installer/wrt_installer_api.cpp +++ b/src/wrt-installer/wrt_installer_api.cpp @@ -87,8 +87,8 @@ void wrt_installer_init(void *userdata, DPL::Log::LogSystemSingleton::Instance().SetTag("WRT"); try { - LogInfo("[WRT-API] INITIALIZING WRT INSTALLER..."); - LogInfo("[WRT-API] BUILD: " << __TIMESTAMP__); + LogDebug("[WRT-API] INITIALIZING WRT INSTALLER..."); + LogDebug("[WRT-API] BUILD: " << __TIMESTAMP__); // Touch InstallerController Singleton InstallerMainThreadSingleton::Instance().TouchArchitecture(); @@ -109,7 +109,7 @@ void wrt_installer_init(void *userdata, InstallerMainThreadSingleton::Instance().AttachDatabases(); - LogInfo("Prepare libxml2 to work in multithreaded program."); + LogDebug("Prepare libxml2 to work in multithreaded program."); xmlInitParser(); // Initialize Language Subtag registry @@ -122,7 +122,7 @@ void wrt_installer_init(void *userdata, InitializeEvent()); if (callback) { - LogInfo("[WRT-API] WRT INSTALLER INITIALIZATION CALLBACK"); + LogDebug("[WRT-API] WRT INSTALLER INITIALIZATION CALLBACK"); callback(WRT_SUCCESS, userdata); } } catch (const DPL::Exception& ex) { @@ -139,7 +139,7 @@ void wrt_installer_init(void *userdata, void wrt_installer_shutdown() { try { - LogInfo("[WRT-API] DEINITIALIZING WRT INSTALLER..."); + LogDebug("[WRT-API] DEINITIALIZING WRT INSTALLER..."); // Installer termination CONTROLLER_POST_SYNC_EVENT( @@ -153,7 +153,7 @@ void wrt_installer_shutdown() ValidationCore::VCoreDeinit(); // Global deinit check - LogInfo("Cleanup libxml2 global values."); + LogDebug("Cleanup libxml2 global values."); xmlCleanupParser(); } catch (const DPL::Exception& ex) { LogError("Internal Error during Shutdown:"); @@ -180,7 +180,7 @@ void wrt_install_widget( DPL::Log::LogSystemSingleton::Instance().AddProvider(oldStyleProvider); } - LogInfo("[WRT-API] INSTALL WIDGET: " << path); + LogDebug("[WRT-API] INSTALL WIDGET: " << path); // Post installation event CONTROLLER_POST_EVENT( Logic::InstallerController, @@ -207,7 +207,7 @@ void wrt_uninstall_widget( UNHANDLED_EXCEPTION_HANDLER_BEGIN { std::string tizenAppid(tzAppid); - LogInfo("[WRT-API] UNINSTALL WIDGET: " << tizenAppid); + LogDebug("[WRT-API] UNINSTALL WIDGET: " << tizenAppid); // Post uninstallation event CONTROLLER_POST_EVENT( Logic::InstallerController, @@ -234,7 +234,7 @@ void wrt_install_plugin( { UNHANDLED_EXCEPTION_HANDLER_BEGIN { - LogInfo("[WRT-API] INSTALL PLUGIN: " << pluginDir); + LogDebug("[WRT-API] INSTALL PLUGIN: " << pluginDir); //Private data for status callback //Resource is free in pluginInstallFinishedCallback InstallerCallbacksTranslate::PluginStatusCallbackStruct* diff --git a/tests/general/TestInit.cpp b/tests/general/TestInit.cpp index 62e30a4..4e4e635 100644 --- a/tests/general/TestInit.cpp +++ b/tests/general/TestInit.cpp @@ -26,7 +26,7 @@ int main (int argc, char *argv[]) { - LogInfo("Starting tests"); + LogDebug("Starting tests"); WrtDB::WrtDatabase::attachToThreadRW(); int status = -- 2.7.4