Skip to content

Commit

Permalink
Return error when failing to open log file
Browse files Browse the repository at this point in the history
[finishes #133832779]
  • Loading branch information
glestaris committed Nov 10, 2016
1 parent 32dfc94 commit 83af7de
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
17 changes: 17 additions & 0 deletions integration/groot/logging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,23 @@ var _ = Describe("Logging", func() {
Expect(string(allTheLogs)).To(ContainSubstring("\"log_level\":1"))
})
})

Context("and the log file cannot be created", func() {
It("returns an error to stdout", func() {
buffer := gbytes.NewBuffer()

_, err := Runner.
WithStdout(buffer).
WithLogFile("/path/to/log_file.log").
Create(groot.CreateSpec{
ID: "my-image",
BaseImage: "/non/existent/rootfs",
})
Expect(err).To(HaveOccurred())

Expect(buffer).To(gbytes.Say("no such file or directory"))
})
})
})
})
})
8 changes: 5 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package main

import (
"fmt"
"os"
"strings"

Expand Down Expand Up @@ -67,7 +66,10 @@ func main() {
cli.ErrWriter = os.Stdout

lagerLogLevel := translateLogLevel(logLevel)
logger, _ := configureLogger(lagerLogLevel, logFile)
logger, err := configureLogger(lagerLogLevel, logFile)
if err != nil {
return err
}
ctx.App.Metadata["logger"] = logger

configurer := store.NewConfigurer()
Expand Down Expand Up @@ -97,7 +99,7 @@ func configureLogger(logLevel lager.LogLevel, logFile string) (lager.Logger, err
var err error
logWriter, err = os.OpenFile(logFile, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
if err != nil {
return nil, fmt.Errorf("cannot create log file `%s`: %s", logFile, err)
return nil, err
}

if logLevel == lager.FATAL {
Expand Down

0 comments on commit 83af7de

Please sign in to comment.