johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backups: Improve logging when backup command fails #4237

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2024-05-09 10:00:43 +02:00
parent 25db3c9b83
commit f5d38978d6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/commands/backup.go
View File

@@ -8,6 +8,7 @@ import (
"os"
"os/exec"
"path/filepath"
"strings"
"time"
"github.com/dustin/go-humanize/english"
@@ -159,10 +160,12 @@ func backupAction(ctx *cli.Context) error {
log.Trace(cmd.String())
// Run backup command.
if err := cmd.Run(); err != nil {
if stderr.String() != "" {
return errors.New(stderr.String())
if cmdErr := cmd.Run(); cmdErr != nil {
if errStr := strings.TrimSpace(stderr.String()); errStr != "" {
return errors.New(errStr)
}
return cmdErr
}
}
@@ -177,8 +180,8 @@ func backupAction(ctx *cli.Context) error {
log.Infof("saving albums in %s", clean.Log(albumsPath))
if count, err := photoprism.BackupAlbums(albumsPath, true); err != nil {
return err
if count, backupErr := photoprism.BackupAlbums(albumsPath, true); backupErr != nil {
return backupErr
} else {
log.Infof("created %s", english.Plural(count, "YAML album file", "YAML album files"))
}