kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-05 01:45:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2672 from eyberg/master

Browse Source 
dont throw away errors in log rotation
This commit is contained in:
Alex Dadgar
2017-05-31 14:14:22 -07:00
committed by GitHub
parent 2aaf149e10 0d76cd24bb
commit 5bdceb4a65
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/driver/logging/rotator.go
View File

@@ -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: