X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=log%2Flog.go;h=818e5ef3f76d12163d51245781ffbc3b1e289048;hp=ebd979f4c6e7cdc75529c4a13008127e499d9f7e;hb=b12c7b5f50749a73b4599c1c15d8e242deb64e8e;hpb=4c30652bc333792725d18fba1f92493369b59e5a diff --git a/log/log.go b/log/log.go index ebd979f4..818e5ef3 100644 --- a/log/log.go +++ b/log/log.go @@ -30,7 +30,7 @@ func InitLogFile(config *config.Config) error { hook := newBtmHook(logPath) logrus.AddHook(hook) - logrus.SetOutput(ioutil.Discard)//控制台不输出 + logrus.SetOutput(ioutil.Discard) //控制台不输出 fmt.Printf("all logs are output in the %s directory\n", logPath) return nil } @@ -68,19 +68,24 @@ func (hook *BtmHook) ioWrite(entry *logrus.Entry) error { return err } - _, err = writer.Write(msg) - return err + if _, err = writer.Write(msg); err != nil { + return err + } + + return writer.Close() } func clearLockFiles(logPath string) error { files, err := ioutil.ReadDir(logPath) - if err != nil { + if os.IsNotExist(err) { + return nil + } else if err != nil { return err } for _, file := range files { if ok := strings.HasSuffix(file.Name(), "_lock"); ok { - if err := os.Remove(filepath.Join(logPath, file.Name()));err!=nil{ + if err := os.Remove(filepath.Join(logPath, file.Name())); err != nil { return err } }