[Libreoffice-commits] core.git: desktop/source

[Markus Mohrhard]

 desktop/source/app/app.cxx     |    3 +--
 desktop/source/app/updater.cxx |    3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 682cd955c36cb97a8fd276fc57be6bdb4bb0e107
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Aug 2 03:57:06 2017 +0200

    updater: always log all Updater messages also to SAL_INFO
    
    Change-Id: Iafb9ebc8c1bc0ed317fa51b40e22bc8531bda6f1
    Reviewed-on: https://gerrit.libreoffice.org/40657
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index dffa9a7ebc95..c6a467682496 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1397,14 +1397,13 @@ int Desktop::Main()
                 OUString aBuildID = Updater::getBuildID();
                 if (aOldBuildID == aBuildID)
                 {
-                    SAL_INFO("desktop", "No updating took place.");
                     Updater::log("Old and new Build ID are the same. No Updating took place.");
                 }
                 else
                 {
                     if (!aSeeAlso.isEmpty())
                     {
-                        SAL_INFO("desktop", "See also: " << aSeeAlso);
+                        SAL_INFO("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 ef4dcd29d122..16e847d50df7 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -750,6 +750,7 @@ OUString Updater::getExecutableDirURL()
 
 void Updater::log(const OUString& rMessage)
 {
+    SAL_INFO("updater", rMessage);
     OUString aUpdateLog = getUpdateInfoLog();
     SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
     aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the end
@@ -758,6 +759,7 @@ void Updater::log(const OUString& rMessage)
 
 void Updater::log(const OString& rMessage)
 {
+    SAL_INFO("updater", rMessage);
     OUString aUpdateLog = getUpdateInfoLog();
     SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
     aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the end
@@ -766,6 +768,7 @@ void Updater::log(const OString& rMessage)
 
 void Updater::log(const char* pMessage)
 {
+    SAL_INFO("updater", pMessage);
     OUString aUpdateLog = getUpdateInfoLog();
     SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
     aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the end