diff options
author | Christian Kamm <mail@ckamm.de> | 2019-08-22 14:56:36 +0300 |
---|---|---|
committer | Christian Kamm <mail@ckamm.de> | 2019-08-22 14:56:36 +0300 |
commit | 9201fd59e7e030a69b8d88be9ea18093a3e1e26a (patch) | |
tree | 2413e2e51d718ba364ac103387fed3e5f3094273 /src/gui/updater | |
parent | 7da58fcf272ca33614097770afa4dbbc6574d948 (diff) |
Updater: Improved logging output #7388
Diffstat (limited to 'src/gui/updater')
-rw-r--r-- | src/gui/updater/ocupdater.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/gui/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp index 641868ba0..956bd9003 100644 --- a/src/gui/updater/ocupdater.cpp +++ b/src/gui/updater/ocupdater.cpp @@ -333,8 +333,16 @@ void NSISUpdater::versionInfoArrived(const UpdateInfo &info) ConfigFile cfg; QSettings settings(cfg.configFile(), QSettings::IniFormat); qint64 infoVersion = Helper::stringVersionToInt(info.version()); - qint64 seenVersion = Helper::stringVersionToInt(settings.value(seenVersionC).toString()); + auto seenString = settings.value(seenVersionC).toString(); + qint64 seenVersion = Helper::stringVersionToInt(seenString); qint64 currVersion = Helper::currentVersionToInt(); + qCInfo(lcUpdater) << "Version info arrived:" + << "Your version:" << currVersion + << "Skipped version:" << seenVersion << seenString + << "Available version:" << infoVersion << info.version() + << "Available version string:" << info.versionString() + << "Web url:" << info.web() + << "Download url:" << info.downloadUrl(); if (info.version().isEmpty()) { qCInfo(lcUpdater) << "No version information available at the moment"; @@ -342,9 +350,6 @@ void NSISUpdater::versionInfoArrived(const UpdateInfo &info) } else if (infoVersion <= currVersion || infoVersion <= seenVersion) { qCInfo(lcUpdater) << "Client is on latest version!"; - qCInfo(lcUpdater) << "Your version:" << currVersion; - qCInfo(lcUpdater) << "Skipped version:" << seenVersion; - qCInfo(lcUpdater) << "Available version:" << infoVersion; setDownloadState(UpToDate); } else { QString url = info.downloadUrl(); @@ -487,18 +492,24 @@ bool NSISUpdater::handleStartup() QString updateFileName = settings.value(updateAvailableC).toString(); // has the previous run downloaded an update? if (!updateFileName.isEmpty() && QFile(updateFileName).exists()) { + qCInfo(lcUpdater) << "An updater file is available"; // did it try to execute the update? if (settings.value(autoUpdateAttemptedC, false).toBool()) { if (updateSucceeded()) { // success: clean up + qCInfo(lcUpdater) << "The requested update attempt has succeeded" + << Helper::currentVersionToInt(); wipeUpdateData(); return false; } else { // auto update failed. Ask user what to do + qCInfo(lcUpdater) << "The requested update attempt has failed" + << settings.value(updateTargetVersionC).toString(); showUpdateErrorDialog(settings.value(updateTargetVersionStringC).toString()); return false; } } else { + qCInfo(lcUpdater) << "Triggering an update"; return performUpdate(); } } |