respect local timezone when show backup time in list, fix #1185

Signed-off-by: Slach <[email protected]>

Author: Slach

ChangeLog.md

@@ -1,3 +1,7 @@
+# v2.6.29
+BUG FIXES
+- respect local timezone when show backup time in list, fix [1185](https://github.com/Altinity/clickhouse-backup/issues/1185)
+
 # v2.6.28
 BUG FIXES
 - time layout for watch backup name shall respect TZ environment variable, fix [1184](https://github.com/Altinity/clickhouse-backup/issues/1184)

pkg/backup/create.go

@@ -53,7 +53,7 @@ type LocalBackup struct {
 
 // NewBackupName - return default backup name
 func NewBackupName() string {
-	return time.Now().UTC().Format(TimeFormatForBackup)
+	return time.Now().Format(TimeFormatForBackup)
 }
 
 // CreateBackup - create new backup of all tables matched by tablePattern
@@ -996,7 +996,7 @@ func (b *Backuper) createBackupMetadata(ctx context.Context, backupMetaFile, bac
 			Disks:                   diskMap,
 			DiskTypes:               diskTypes,
 			ClickhouseBackupVersion: version,
-			CreationDate:            time.Now().UTC(),
+			CreationDate:            time.Now(),
 			Tags:                    tags,
 			ClickHouseVersion:       b.ch.GetVersionDescribe(ctx),
 			DataSize:                backupDataSize,

pkg/backup/list.go

@@ -19,6 +19,7 @@ import (
 	"sort"
 	"strings"
 	"text/tabwriter"
+	"time"
 )
 
 // List - list backups to stdout from command line
@@ -51,7 +52,7 @@ func printBackupsRemote(w io.Writer, backupList []storage.Backup, format string)
 		for _, backup := range backupList {
 			size := fmt.Sprintf("all:%s,data:%s,arch:%s,obj:%s,meta:%s,rbac:%s,conf:%s", utils.FormatBytes(backup.GetFullSize()), utils.FormatBytes(backup.DataSize), utils.FormatBytes(backup.CompressedSize), utils.FormatBytes(backup.ObjectDiskSize), utils.FormatBytes(backup.MetadataSize), utils.FormatBytes(backup.RBACSize), utils.FormatBytes(backup.ConfigSize))
 			description := backup.DataFormat
-			uploadDate := backup.UploadDate.Format("02/01/2006 15:04:05")
+			uploadDate := backup.UploadDate.In(time.Local).Format("2006-02-01 15:04:05")
 			if backup.Tags != "" {
 				description += ", " + backup.Tags
 			}
@@ -99,7 +100,7 @@ func printBackupsLocal(ctx context.Context, w io.Writer, backupList []LocalBacku
 					}
 					description += backup.Tags
 				}
-				creationDate := backup.CreationDate.Format("02/01/2006 15:04:05")
+				creationDate := backup.CreationDate.In(time.Local).Format("2006-02-01 15:04:05")
 				required := ""
 				if backup.RequiredBackup != "" {
 					required = "+" + backup.RequiredBackup

pkg/pidlock/pidlock.go

@@ -34,7 +34,7 @@ func CheckAndCreatePidFile(backupName string, command string) error {
 	}
 
 	// Write new PID file
-	pid := fmt.Sprintf("%d|%s|%s", os.Getpid(), command, time.Now().UTC().Format(time.RFC3339))
+	pid := fmt.Sprintf("%d|%s|%s", os.Getpid(), command, time.Now().Format(time.RFC3339))
 	return os.WriteFile(pidPath, []byte(pid), 0644)
 }
 

pkg/server/server.go

@@ -855,7 +855,7 @@ func (api *APIServer) httpListHandler(w http.ResponseWriter, r *http.Request) {
 			}
 			backupsJSON = append(backupsJSON, backupJSON{
 				Name:           item.BackupName,
-				Created:        item.CreationDate.Format(common.TimeFormat),
+				Created:        item.CreationDate.In(time.Local).Format(common.TimeFormat),
 				Size:           item.GetFullSize(),
 				DataSize:       item.DataSize,
 				ObjectDiskSize: item.ObjectDiskSize,
@@ -892,7 +892,7 @@ func (api *APIServer) httpListHandler(w http.ResponseWriter, r *http.Request) {
 			fullSize := item.GetFullSize()
 			backupsJSON = append(backupsJSON, backupJSON{
 				Name:           item.BackupName,
-				Created:        item.CreationDate.Format(common.TimeFormat),
+				Created:        item.CreationDate.In(time.Local).Format(common.TimeFormat),
 				Size:           fullSize,
 				DataSize:       item.DataSize,
 				ObjectDiskSize: item.ObjectDiskSize,