summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-09 15:43:36 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-13 17:55:48 +0200
commit93d641caceecb953fa268745c29a0c9fb30f6457 (patch)
treeb7a337fd31c24ffc31c91f08fde594caa9d82c06
parent1e7b9c6826f07b724b433e978b0f580460168752 (diff)
updater: use desktop.updater log scope consistently
Change-Id: I242890aeda4820ada6f06e4cbe01b73d5faf549e Reviewed-on: https://gerrit.libreoffice.org/40924 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--desktop/source/app/updater.cxx9
2 files changed, 5 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cc5e59dcda9b..7557e78a414b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1403,7 +1403,7 @@ int Desktop::Main()
{
if (!aSeeAlso.isEmpty())
{
- SAL_INFO("updater", "See also: " << aSeeAlso);
+ SAL_INFO("desktop.updater", "See also: " << aSeeAlso);
Reference< css::system::XSystemShellExecute > xSystemShell(
SystemShellExecute::create(::comphelper::getProcessComponentContext()) );
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 6c0206059a6a..f284eab096e5 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -297,7 +297,6 @@ bool update()
}
else
{
- SAL_WARN("updater", "Executable Path:" << aUpdaterPath);
for (size_t i = 0; i < 8 + rtl_getAppCommandArgCount(); ++i)
{
SAL_WARN("desktop.updater", pArgs[i]);
@@ -378,13 +377,13 @@ update_file parse_update_file(const orcus::json::detail::node& rNode)
{
if (rNode.type() != orcus::json::detail::node_t::object)
{
- SAL_WARN("desktop.update", "invalid update or language file entry");
+ SAL_WARN("desktop.updater", "invalid update or language file entry");
throw invalid_update_info();
}
if (rNode.child_count() < 4)
{
- SAL_WARN("desktop.update", "invalid update or language file entry");
+ SAL_WARN("desktop.updater", "invalid update or language file entry");
throw invalid_update_info();
}
@@ -395,7 +394,7 @@ update_file parse_update_file(const orcus::json::detail::node& rNode)
if (aHashTypeNode.string_value() != "sha512")
{
- SAL_WARN("desktop.update", "invalid hash type");
+ SAL_WARN("desktop.updater", "invalid hash type");
throw invalid_update_info();
}
@@ -419,7 +418,7 @@ update_info parse_response(const std::string& rResponse)
auto aDocumentRoot = aJsonDoc.get_document_root();
if (aDocumentRoot.type() != orcus::json_node_t::object)
{
- SAL_WARN("desktop.Update", "invalid root entries: " << rResponse);
+ SAL_WARN("desktop.updater", "invalid root entries: " << rResponse);
throw invalid_update_info();
}