Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Müller <fmueller@owncloud.com>2021-10-21 18:07:56 +0300
committerHannah von Reth <vonreth@kde.org>2021-11-18 18:54:52 +0300
commita151fcd4fa5b37c71ea4b04945459c969b9918f8 (patch)
tree9e951d113ba33fd99eca57d2c57f62497417890b /src/gui/accountmanager.cpp
parent45d631fb5534adf6917faed913b317aacdf37751 (diff)
Add prefix to legacy migration log messages
Makes it easier to distinguish between the regular migration code and the legacy code's logging.
Diffstat (limited to 'src/gui/accountmanager.cpp')
-rw-r--r--src/gui/accountmanager.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index b7ea4f36e..5310ff777 100644
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -135,7 +135,10 @@ void AccountManager::backwardMigrationSettingsKeys(QStringList *deleteKeys, QStr
bool AccountManager::restoreFromLegacySettings()
{
- qCInfo(lcAccountManager) << "Migrate: restoreFromLegacySettings, checking settings group"
+ static const auto logPrefix = QStringLiteral("Legacy settings migration: ");
+
+ qCInfo(lcAccountManager) << logPrefix
+ << "restoreFromLegacySettings, checking settings group"
<< Theme::instance()->appName();
// try to open the correctly themed settings
@@ -151,7 +154,8 @@ bool AccountManager::restoreFromLegacySettings()
oCCfgFile = oCCfgFile.left(oCCfgFile.lastIndexOf('/'));
oCCfgFile += QLatin1String("/ownCloud/owncloud.cfg");
- qCInfo(lcAccountManager) << "Migrate: checking old config " << oCCfgFile;
+ qCInfo(lcAccountManager) << logPrefix
+ << "checking old config " << oCCfgFile;
#ifdef Q_OS_WIN
Utility::NtfsPermissionLookupRAII ntfs_perm;
@@ -174,7 +178,8 @@ bool AccountManager::restoreFromLegacySettings()
// in case the urls are equal reset the settings object to read from
// the ownCloud settings object
- qCInfo(lcAccountManager) << "Migrate oC config if " << oCUrl << " == " << overrideUrl << ":"
+ qCInfo(lcAccountManager) << logPrefix
+ << "Migrate oC config if " << oCUrl << " == " << overrideUrl << ":"
<< (oCUrl == overrideUrl ? "Yes" : "No");
if (oCUrl == overrideUrl) {
settings = std::move(oCSettings);