From 03c19bc1c8c26f3a0d352d91339d43150cba6979 Mon Sep 17 00:00:00 2001 From: "Alexander \"Arav\" Andreev" Date: Sun, 6 Mar 2022 22:00:07 +0400 Subject: [PATCH] logClean renamed to logClear. deletedSize and deletedCount are incremented now if there was no error. --- cmd/dwelling-upload-clear/main.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/dwelling-upload-clear/main.go b/cmd/dwelling-upload-clear/main.go index 7df3818..a6105cd 100644 --- a/cmd/dwelling-upload-clear/main.go +++ b/cmd/dwelling-upload-clear/main.go @@ -66,11 +66,11 @@ func main() { } defer logErr.Close() - logClean, err := logging.NewLogger(config.Log.Clear, config.Log.ToStdout) + logClear, err := logging.NewLogger(config.Log.Clear, config.Log.ToStdout) if err != nil { log.Fatalln("failed to open error logger:", err) } - defer logClean.Close() + defer logClear.Close() uploadsDir, err := ioutil.ReadDir(config.Uploads.Directory) if err != nil { @@ -84,15 +84,16 @@ func main() { if time.Now().UTC().Sub(entry.ModTime().UTC()) >= time.Duration(config.Uploads.Limits.KeepForHours)*time.Hour { if err := os.Remove(path.Join(config.Uploads.Directory, entry.Name())); err != nil { logErr.Println("failed to remove file ", entry.Name(), ": ", err) + } else { + deletedSize += entry.Size() + deletedCount++ } - deletedSize += entry.Size() - deletedCount++ } } _, _, cFSz := utils.ConvertFileSize(deletedSize) if deletedCount > 0 { - logClean.Printf("%d %s", deletedCount, cFSz) + logClear.Printf("%d %s", deletedCount, cFSz) } }