From 59da197de8f040eed7560747476f97ce8afad293 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Tue, 2 Dec 2014 10:47:57 -0800 Subject: [PATCH] Remove unused Engine.Logf The `Engine.Logf` method was unused and confusing. Signed-off-by: Arnaud Porterie --- daemon/daemon.go | 1 - engine/engine.go | 9 --------- engine/engine_test.go | 10 ---------- 3 files changed, 20 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index 667b2cb4cd..fe6e0eb2aa 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -926,7 +926,6 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error) eng.OnShutdown(func() { // FIXME: if these cleanup steps can be called concurrently, register // them as separate handlers to speed up total shutdown time - // FIXME: use engine logging instead of log.Errorf if err := daemon.shutdown(); err != nil { log.Errorf("daemon.shutdown(): %s", err) } diff --git a/engine/engine.go b/engine/engine.go index 769f644a17..26f9953d66 100644 --- a/engine/engine.go +++ b/engine/engine.go @@ -11,7 +11,6 @@ import ( "time" "github.com/docker/docker/pkg/ioutils" - "github.com/docker/docker/pkg/timeutils" "github.com/docker/docker/utils" ) @@ -251,11 +250,3 @@ func (eng *Engine) ParseJob(input string) (*Job, error) { job.Env().Init(&env) return job, nil } - -func (eng *Engine) Logf(format string, args ...interface{}) (n int, err error) { - if !eng.Logging { - return 0, nil - } - prefixedFormat := fmt.Sprintf("[%s] [%s] %s\n", time.Now().Format(timeutils.RFC3339NanoFixed), eng, strings.TrimRight(format, "\n")) - return fmt.Fprintf(eng.Stderr, prefixedFormat, args...) -} diff --git a/engine/engine_test.go b/engine/engine_test.go index 92f3757251..7ab2f8fc0d 100644 --- a/engine/engine_test.go +++ b/engine/engine_test.go @@ -99,16 +99,6 @@ func TestEngineString(t *testing.T) { } } -func TestEngineLogf(t *testing.T) { - eng := New() - input := "Test log line" - if n, err := eng.Logf("%s\n", input); err != nil { - t.Fatal(err) - } else if n < len(input) { - t.Fatalf("Test: Logf() should print at least as much as the input\ninput=%d\nprinted=%d", len(input), n) - } -} - func TestParseJob(t *testing.T) { eng := New() // Verify that the resulting job calls to the right place