beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4166 from shykes/engine-logging

Browse source 
Engine: optional Logging field to disable custom logging in engine.
This commit is contained in:
Solomon Hykes 2014-04-18 18:05:00 -07:00
commit 4c720d4de7
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
engine/engine.go
View file

@ -44,6 +44,7 @@ type Engine struct {
Stdout io.Writer
Stderr io.Writer
Stdin io.Reader
Logging bool
}
func (eng *Engine) Root() string {
@ -96,6 +97,7 @@ func New(root string) (*Engine, error) {
Stdout: os.Stdout,
Stderr: os.Stderr,
Stdin: os.Stdin,
Logging: true,
}
eng.Register("commands", func(job *Job) Status {
for _, name := range eng.commands() {
@ -137,7 +139,9 @@ func (eng *Engine) Job(name string, args ...string) *Job {
Stderr: NewOutput(),
env: &Env{},
}
job.Stderr.Add(utils.NopWriteCloser(eng.Stderr))
if eng.Logging {
job.Stderr.Add(utils.NopWriteCloser(eng.Stderr))
}
handler, exists := eng.handlers[name]
if exists {
job.handler = handler
@ -188,9 +192,9 @@ func (eng *Engine) ParseJob(input string) (*Job, error) {
}
func (eng *Engine) Logf(format string, args ...interface{}) (n int, err error) {
if os.Getenv("TEST") == "" {
prefixedFormat := fmt.Sprintf("[%s] %s\n", eng, strings.TrimRight(format, "\n"))
return fmt.Fprintf(eng.Stderr, prefixedFormat, args...)
if !eng.Logging {
return 0, nil
}
return 0, nil
prefixedFormat := fmt.Sprintf("[%s] %s\n", eng, strings.TrimRight(format, "\n"))
return fmt.Fprintf(eng.Stderr, prefixedFormat, args...)
}

8
engine/job.go
View file

@ -3,7 +3,6 @@ package engine
import (
"fmt"
"io"
"os"
"strings"
"time"
)
@ -189,11 +188,8 @@ func (job *Job) Environ() map[string]string {
}
func (job *Job) Logf(format string, args ...interface{}) (n int, err error) {
if os.Getenv("TEST") == "" {
prefixedFormat := fmt.Sprintf("[%s] %s\n", job, strings.TrimRight(format, "\n"))
return fmt.Fprintf(job.Stderr, prefixedFormat, args...)
}
return 0, nil
prefixedFormat := fmt.Sprintf("[%s] %s\n", job, strings.TrimRight(format, "\n"))
return fmt.Fprintf(job.Stderr, prefixedFormat, args...)
}
func (job *Job) Printf(format string, args ...interface{}) (n int, err error) {