From a005620db4d0eed1e254aa61e18c723485af4d4e Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Fri, 12 Jan 2024 11:04:08 -0500
Subject: [PATCH 1/2] Refactor and enhance upload logging

---
 auto/backup/uploader.go | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/auto/backup/uploader.go b/auto/backup/uploader.go
index e0a10293..a99ab009 100644
--- a/auto/backup/uploader.go
+++ b/auto/backup/uploader.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/rqlite/rqlite/v8/db/humanize"
 	"github.com/rqlite/rqlite/v8/progress"
 )
 
@@ -194,17 +195,21 @@ func (u *Uploader) upload(ctx context.Context) error {
 	err = u.storageClient.Upload(ctx, cr, filesum)
 	if err != nil {
 		stats.Add(numUploadsFail, 1)
-	} else {
-		u.lastSumUploaded = filesum
-		u.lastModified = lm
-		stats.Add(numUploadsOK, 1)
-		stats.Add(totalUploadBytes, cr.Count())
-		stats.Get(lastUploadBytes).(*expvar.Int).Set(cr.Count())
-		u.lastUploadTime = time.Now()
-		u.lastUploadDuration = time.Since(startTime)
-		u.logger.Printf("completed auto upload to %s in %s", u.storageClient, u.lastUploadDuration)
+		return err
 	}
-	return err
+
+	// Successful upload!
+	u.lastSumUploaded = filesum
+	u.lastModified = lm
+	stats.Add(numUploadsOK, 1)
+	stats.Add(totalUploadBytes, cr.Count())
+	stats.Get(lastUploadBytes).(*expvar.Int).Set(cr.Count())
+	u.lastUploadTime = time.Now()
+	u.lastUploadDuration = time.Since(startTime)
+	u.logger.Printf("completed auto upload of %s to %s in %s",
+		humanize.Bytes(uint64(stats.Get(lastUploadBytes).(*expvar.Int).Value())),
+		u.storageClient, u.lastUploadDuration)
+	return nil
 }
 
 func (u *Uploader) currentSum(ctx context.Context) (SHA256Sum, error) {

From 5f4be92d4be685e6dfbf86aff9eb94d63b77759a Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Fri, 12 Jan 2024 11:07:03 -0500
Subject: [PATCH 2/2] CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d43f5b19..8ebcd853 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 8.16.5 (unreleased)
+### Implementation changes and bug fixes
+- [PR #1592](https://github.com/rqlite/rqlite/pull/1592): Refactor and enhance upload logging.
+
 ## 8.16.4 (January 12th 2024)
 ### Implementation changes and bug fixes
 - [PR #1584](https://github.com/rqlite/rqlite/pull/1584): Count Snapshot reaping failures.