From 8f206929b27dff60e9b47637ab8b2dbbb98c21c7 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 11 Mar 2016 17:08:03 -0800 Subject: [PATCH] Ensure logs are flushed This ensures that anything written to the logs are synced as they happen. This also changes the error message of the libcontainer error. The original idea was to have this extra information in the message but it makes it hard to parse and if the caller needed this information they can just get it from the error type. Signed-off-by: Michael Crosby --- libcontainer/generic_error.go | 3 +-- main.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libcontainer/generic_error.go b/libcontainer/generic_error.go index 93bb7570..3ed33da6 100644 --- a/libcontainer/generic_error.go +++ b/libcontainer/generic_error.go @@ -1,7 +1,6 @@ package libcontainer import ( - "fmt" "io" "text/template" "time" @@ -76,7 +75,7 @@ type genericError struct { } func (e *genericError) Error() string { - return fmt.Sprintf("[%d] %s: %s", e.ECode, e.ECode, e.Message) + return e.Message } func (e *genericError) Code() ErrorCode { diff --git a/main.go b/main.go index f8982f6e..c4cb0b60 100644 --- a/main.go +++ b/main.go @@ -100,7 +100,7 @@ func main() { logrus.SetLevel(logrus.DebugLevel) } if path := context.GlobalString("log"); path != "" { - f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666) + f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND|os.O_SYNC, 0666) if err != nil { return err }