beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Logs: More consistent log format for commands

Browse source
This commit is contained in:
Michael Mayer 2021-10-02 15:34:41 +02:00
parent de737a6eef
commit bf0153267d
14 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/commands/backup.go
View file

@ -186,7 +186,7 @@ func backupAction(ctx *cli.Context) error {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("backup completed [%s]", elapsed) log.Infof("backup completed in %s", elapsed)
conf.Shutdown() conf.Shutdown()

2
internal/commands/cleanup.go
View file

@ -57,7 +57,7 @@ func cleanUpAction(ctx *cli.Context) error {
if thumbs, orphans, err := w.Start(opt); err != nil { if thumbs, orphans, err := w.Start(opt); err != nil {
return err return err
} else { } else {
log.Infof("cleanup: removed %s and %s [%s]", english.Plural(orphans, "index entry", "index entries"), english.Plural(thumbs, "thumbnail", "thumbnails"), time.Since(start)) log.Infof("removed %s and %s in %s", english.Plural(orphans, "index entry", "index entries"), english.Plural(thumbs, "thumbnail", "thumbnails"), time.Since(start))
} }
conf.Shutdown() conf.Shutdown()

2
internal/commands/convert.go
View file

@ -58,7 +58,7 @@ func convertAction(ctx *cli.Context) error {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("converting completed [%s]", elapsed) log.Infof("converting completed in %s", elapsed)
return nil return nil
} }

4
internal/commands/copy.go
View file

@ -71,7 +71,9 @@ func copyAction(ctx *cli.Context) error {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("import completed [%s]", elapsed) log.Infof("import completed in %s", elapsed)
conf.Shutdown() conf.Shutdown()
return nil return nil
} }

14
internal/commands/faces.go
View file

@ -99,7 +99,7 @@ func facesStatsAction(ctx *cli.Context) error {
} else { } else {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("completed [%s]", elapsed) log.Infof("completed in %s", elapsed)
} }
conf.Shutdown() conf.Shutdown()
@ -130,7 +130,7 @@ func facesAuditAction(ctx *cli.Context) error {
} else { } else {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("completed [%s]", elapsed) log.Infof("completed in %s", elapsed)
} }
conf.Shutdown() conf.Shutdown()
@ -174,7 +174,7 @@ func facesResetAction(ctx *cli.Context) error {
} else { } else {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("completed [%s]", elapsed) log.Infof("completed in %s", elapsed)
} }
conf.Shutdown() conf.Shutdown()
@ -212,7 +212,7 @@ func facesResetAllAction(ctx *cli.Context) error {
} else { } else {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("completed [%s]", elapsed) log.Infof("completed in %s", elapsed)
} }
conf.Shutdown() conf.Shutdown()
@ -278,7 +278,7 @@ func facesIndexAction(ctx *cli.Context) error {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("indexed %d files [%s]", len(indexed), elapsed) log.Infof("indexed %s in %s", english.Plural(len(indexed), "file", "files"), elapsed)
conf.Shutdown() conf.Shutdown()
@ -312,7 +312,7 @@ func facesUpdateAction(ctx *cli.Context) error {
} else { } else {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("completed [%s]", elapsed) log.Infof("completed in %s", elapsed)
} }
conf.Shutdown() conf.Shutdown()
@ -343,7 +343,7 @@ func facesOptimizeAction(ctx *cli.Context) error {
} else { } else {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("%d face clusters merged [%s]", res.Merged, elapsed) log.Infof("%s merged in %s", english.Plural(res.Merged, "face cluster", "face clusters"), elapsed)
} }
conf.Shutdown() conf.Shutdown()

4
internal/commands/import.go
View file

@ -71,7 +71,9 @@ func importAction(ctx *cli.Context) error {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("import completed [%s]", elapsed) log.Infof("import completed in %s", elapsed)
conf.Shutdown() conf.Shutdown()
return nil return nil
} }

2
internal/commands/index.go
View file

@ -110,7 +110,7 @@ func indexAction(ctx *cli.Context) error {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("indexed %d files [%s]", len(indexed), elapsed) log.Infof("indexed %s in %s", english.Plural(len(indexed), "file", "files"), elapsed)
conf.Shutdown() conf.Shutdown()

2
internal/commands/migrate.go
View file

@ -35,7 +35,7 @@ func migrateAction(ctx *cli.Context) error {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("database migration completed [%s]", elapsed) log.Infof("database migration completed in %s", elapsed)
conf.Shutdown() conf.Shutdown()

2
internal/commands/moments.go
View file

@ -44,7 +44,7 @@ func momentsAction(ctx *cli.Context) error {
} else { } else {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("completed [%s]", elapsed) log.Infof("completed in %s", elapsed)
} }
conf.Shutdown() conf.Shutdown()

2
internal/commands/optimize.go
View file

@ -45,7 +45,7 @@ func optimizeAction(ctx *cli.Context) error {
} else { } else {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("completed [%s]", elapsed) log.Infof("completed in %s", elapsed)
} }
conf.Shutdown() conf.Shutdown()

4
internal/commands/purge.go
View file

@ -76,9 +76,7 @@ func purgeAction(ctx *cli.Context) error {
if files, photos, err := w.Start(opt); err != nil { if files, photos, err := w.Start(opt); err != nil {
return err return err
} else { } else {
elapsed := time.Since(start) log.Infof("purged %s and %s in %s", english.Plural(len(files), "file", "files"), english.Plural(len(photos), "photo", "photos"), time.Since(start))
log.Infof("purge: removed %s and %s [%s]", english.Plural(len(files), "file", "files"), english.Plural(len(photos), "photo", "photos"), elapsed)
} }
conf.Shutdown() conf.Shutdown()

4
internal/commands/resample.go
View file

@ -44,9 +44,7 @@ func resampleAction(ctx *cli.Context) error {
return err return err
} }
elapsed := time.Since(start) log.Infof("thumbnails created in %s", time.Since(start))
log.Infof("thumbnails created [%s]", elapsed)
return nil return nil
} }

2
internal/commands/reset.go
View file

@ -57,7 +57,7 @@ func resetAction(ctx *cli.Context) error {
entity.Admin.InitPassword(conf.AdminPassword()) entity.Admin.InitPassword(conf.AdminPassword())
} }
log.Infof("database reset completed [%s]", time.Since(start)) log.Infof("database reset completed in %s", time.Since(start))
} else { } else {
log.Infof("keeping index database") log.Infof("keeping index database")
} }

2
internal/commands/restore.go
View file

@ -212,7 +212,7 @@ func restoreAction(ctx *cli.Context) error {
elapsed := time.Since(start) elapsed := time.Since(start)
log.Infof("backup restored [%s]", elapsed) log.Infof("backup restored in %s", elapsed)
conf.Shutdown() conf.Shutdown()