From 9baf2b38d025eaf1d9bbb10a4616c71813ea7054 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 27 Aug 2014 16:39:36 +0800 Subject: Bug fix on organization --- modules/log/file.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'modules/log/file.go') diff --git a/modules/log/file.go b/modules/log/file.go index 52a2f68c..e9402815 100644 --- a/modules/log/file.go +++ b/modules/log/file.go @@ -210,13 +210,19 @@ func (w *FileLogWriter) DoRotate() error { func (w *FileLogWriter) deleteOldLog() { dir := filepath.Dir(w.Filename) - filepath.Walk(dir, func(path string, info os.FileInfo, err error) error { + filepath.Walk(dir, func(path string, info os.FileInfo, err error) (returnErr error) { + defer func() { + if r := recover(); r != nil { + returnErr = fmt.Errorf("Unable to delete old log '%s', error: %+v", path, r) + } + }() + if !info.IsDir() && info.ModTime().Unix() < (time.Now().Unix()-60*60*24*w.Maxdays) { if strings.HasPrefix(filepath.Base(path), filepath.Base(w.Filename)) { os.Remove(path) } } - return nil + return returnErr }) } -- cgit v1.2.3