From 53c2b82d2e65b9e4ef9ddec67d5bec76776f121f Mon Sep 17 00:00:00 2001
From: Daniel <dhaavi@users.noreply.github.com>
Date: Fri, 4 Aug 2023 21:50:03 +0200
Subject: [PATCH] Improve logging

---
 resolver/resolve.go             | 18 +++++++++++++-----
 updates/os_integration_linux.go |  4 ++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/resolver/resolve.go b/resolver/resolve.go
index 94a8f583..09ee2685 100644
--- a/resolver/resolve.go
+++ b/resolver/resolve.go
@@ -293,11 +293,19 @@ func startAsyncQuery(ctx context.Context, q *Query, currentRRCache *RRCache) {
 
 	// Set flag and log that we are refreshing this entry.
 	currentRRCache.RequestingNew = true
-	log.Tracer(ctx).Tracef(
-		"resolver: cache for %s will expire in %s, refreshing async now",
-		q.ID(),
-		time.Until(time.Unix(currentRRCache.Expires, 0)).Round(time.Second),
-	)
+	if currentRRCache.Expired() {
+		log.Tracer(ctx).Tracef(
+			"resolver: cache for %s has expired %s ago, refreshing async now",
+			q.ID(),
+			time.Since(time.Unix(currentRRCache.Expires, 0)).Round(time.Second),
+		)
+	} else {
+		log.Tracer(ctx).Tracef(
+			"resolver: cache for %s will expire in %s, refreshing async now",
+			q.ID(),
+			time.Until(time.Unix(currentRRCache.Expires, 0)).Round(time.Second),
+		)
+	}
 
 	// resolve async
 	module.StartWorker("resolve async", func(asyncCtx context.Context) error {
diff --git a/updates/os_integration_linux.go b/updates/os_integration_linux.go
index 4f6554c0..b20e3da4 100644
--- a/updates/os_integration_linux.go
+++ b/updates/os_integration_linux.go
@@ -130,8 +130,8 @@ func upgradeSystemIntegrationFileContents(
 	}
 
 	// Check if we are allowed to upgrade from the existing file.
-	if !slices.Contains[string](permittedUpgradeHashes, existingHexSum) {
-		return fmt.Errorf("%s at %s %w, as it is not a previously published version and cannot be automatically upgraded - try installing again", name, filePath, ErrRequiresManualUpgrade)
+	if !slices.Contains[[]string, string](permittedUpgradeHashes, existingHexSum) {
+		return fmt.Errorf("%s at %s (sha256:%s) %w, as it is not a previously published version and cannot be automatically upgraded - try installing again", name, filePath, existingHexSum, ErrRequiresManualUpgrade)
 	}
 
 	// Start with upgrade!