From de4d2f47243eefc7361d2e7a48e06963e988eec2 Mon Sep 17 00:00:00 2001
From: Matthew Penner <me@matthewp.io>
Date: Sun, 27 Dec 2020 13:01:34 -0700
Subject: [PATCH] Make logs follow a more consistent format

---
 router/router_transfer.go     |  2 +-
 server/backup/backup.go       |  2 +-
 server/backup/backup_local.go |  4 ++--
 server/backup/backup_s3.go    | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/router/router_transfer.go b/router/router_transfer.go
index 7436708..7f0b83f 100644
--- a/router/router_transfer.go
+++ b/router/router_transfer.go
@@ -375,7 +375,7 @@ func postTransfer(c *gin.Context) {
 		}
 
 		sendTransferLog("Writing archive to disk...")
-		data.log().Info("writing transfer archive to disk..")
+		data.log().Info("writing transfer archive to disk...")
 
 		// Copy the file.
 		progress := &downloadProgress{size: size}
diff --git a/server/backup/backup.go b/server/backup/backup.go
index 46e20b9..b7c0c7b 100644
--- a/server/backup/backup.go
+++ b/server/backup/backup.go
@@ -123,7 +123,7 @@ func (b *Backup) Details() *ArchiveDetails {
 	go func() {
 		defer wg.Done()
 
-		l.Info("computing checksum for backup..")
+		l.Info("computing checksum for backup...")
 		resp, err := b.Checksum()
 		if err != nil {
 			log.WithFields(log.Fields{
diff --git a/server/backup/backup_local.go b/server/backup/backup_local.go
index dbea642..871ebb2 100644
--- a/server/backup/backup_local.go
+++ b/server/backup/backup_local.go
@@ -53,11 +53,11 @@ func (b *LocalBackup) Generate(basePath, ignore string) (*ArchiveDetails, error)
 		"adapter":   "local",
 	})
 
-	l.Info("attempting to create backup..")
+	l.Info("creating backup for server...")
 	if err := a.Create(b.Path()); err != nil {
 		return nil, err
 	}
-	l.Info("created backup successfully.")
+	l.Info("created backup successfully")
 
 	return b.Details(), nil
 }
diff --git a/server/backup/backup_s3.go b/server/backup/backup_s3.go
index 1f8bd9a..8e22fec 100644
--- a/server/backup/backup_s3.go
+++ b/server/backup/backup_s3.go
@@ -32,11 +32,11 @@ func (s *S3Backup) Generate(basePath, ignore string) (*ArchiveDetails, error) {
 		"adapter":   "s3",
 	})
 
-	l.Info("attempting to create backup..")
+	l.Info("creating backup for server...")
 	if err := a.Create(s.Path()); err != nil {
 		return nil, err
 	}
-	l.Info("created backup successfully.")
+	l.Info("created backup successfully")
 
 	rc, err := os.Open(s.Path())
 	if err != nil {
@@ -75,21 +75,21 @@ func (s *S3Backup) generateRemoteRequest(rc io.ReadCloser) error {
 		"adapter":   "s3",
 	})
 
-	l.Debug("attempting to get size of backup..")
+	l.Debug("attempting to get size of backup...")
 	size, err := s.Backup.Size()
 	if err != nil {
 		return err
 	}
 	l.WithField("size", size).Debug("got size of backup")
 
-	l.Debug("attempting to get S3 upload urls from Panel..")
+	l.Debug("attempting to get S3 upload urls from Panel...")
 	urls, err := api.New().GetBackupRemoteUploadURLs(s.Backup.Uuid, size)
 	if err != nil {
 		return err
 	}
 	l.Debug("got S3 upload urls from the Panel")
 	partCount := len(urls.Parts)
-	l.WithField("parts", partCount).Info("attempting to upload backup..")
+	l.WithField("parts", partCount).Info("attempting to upload backup...")
 
 	handlePart := func(part string, size int64) (string, error) {
 		r, err := http.NewRequest(http.MethodPut, part, nil)
@@ -139,7 +139,7 @@ func (s *S3Backup) generateRemoteRequest(rc io.ReadCloser) error {
 			return err
 		}
 
-		l.WithField("part_id", part).Info("successfully uploaded backup part.")
+		l.WithField("part_id", part).Info("successfully uploaded backup part")
 	}
 
 	l.WithField("parts", partCount).Info("backup has been successfully uploaded")