From 0d76cd24bb3faa77aaa369e90ac8cac6c6917e08 Mon Sep 17 00:00:00 2001 From: Ian Eyberg Date: Thu, 25 May 2017 11:49:33 -0700 Subject: [PATCH] dont throw away errors in log rotation --- client/driver/logging/rotator.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/driver/logging/rotator.go b/client/driver/logging/rotator.go index 5cf200ee2..7494ad09c 100644 --- a/client/driver/logging/rotator.go +++ b/client/driver/logging/rotator.go @@ -220,6 +220,7 @@ func (f *FileRotator) purgeOldFiles() { var fIndexes []int files, err := ioutil.ReadDir(f.path) if err != nil { + f.logger.Printf("[ERROR] driver.rotator: error getting directory listing: %v", err) return } // Inserting all the rotated files in a slice @@ -228,6 +229,7 @@ func (f *FileRotator) purgeOldFiles() { fileIdx := strings.TrimPrefix(fi.Name(), fmt.Sprintf("%s.", f.baseFileName)) n, err := strconv.Atoi(fileIdx) if err != nil { + f.logger.Printf("[ERROR] driver.rotator: error extracting file index: %v", err) continue } fIndexes = append(fIndexes, n) @@ -246,7 +248,10 @@ func (f *FileRotator) purgeOldFiles() { toDelete := fIndexes[0 : len(fIndexes)-f.MaxFiles] for _, fIndex := range toDelete { fname := filepath.Join(f.path, fmt.Sprintf("%s.%d", f.baseFileName, fIndex)) - os.RemoveAll(fname) + err := os.RemoveAll(fname) + if err != nil { + f.logger.Printf("[ERROR] driver.rotator: error removing file: %v", err) + } } f.oldestLogFileIdx = fIndexes[0] case <-f.doneCh: