bump(github.com/coreos/go-log/log):

Author: Brandon Philips

third_party/github.com/coreos/go-log/log/commands.go

@@ -1,5 +1,5 @@
 package log
-// Copyright 2013, David Fisher. All rights reserved.
+// Copyright 2013, CoreOS, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

third_party/github.com/coreos/go-log/log/fields.go

@@ -1,5 +1,5 @@
 package log
-// Copyright 2013, David Fisher. All rights reserved.
+// Copyright 2013, CoreOS, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

third_party/github.com/coreos/go-log/log/logger.go

@@ -1,5 +1,5 @@
 package log
-// Copyright 2013, David Fisher. All rights reserved.
+// Copyright 2013, CoreOS, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,10 +18,9 @@ package log
 
 import (
 	"bitbucket.org/kardianos/osext"
-	"github.com/coreos/go-systemd/journal"
+	"os"
 	"path"
 	"time"
-	"os"
 )
 
 // Logger is user-immutable immutable struct which can log to several outputs
@@ -69,10 +68,5 @@ func NewSimple(sinks ...Sink) *Logger {
 var defaultLogger *Logger
 
 func init() {
-	sinks := make([]Sink, 0)
-	sinks = append(sinks, WriterSink(os.Stdout, BasicFormat, BasicFields))
-	if journal.Enabled() {
-		sinks = append(sinks, JournalSink())
-	}
-	defaultLogger = NewSimple(sinks...)
+	defaultLogger = NewSimple(CombinedSink(os.Stdout, BasicFormat, BasicFields))
 }

third_party/github.com/coreos/go-log/log/priority.go

@@ -1,5 +1,5 @@
 package log
-// Copyright 2013, David Fisher. All rights reserved.
+// Copyright 2013, CoreOS, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

third_party/github.com/coreos/go-log/log/sinks.go

@@ -1,6 +1,5 @@
 package log
-
-// Copyright 2013, David Fisher. All rights reserved.
+// Copyright 2013, CoreOS, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -112,26 +111,25 @@ func JournalSink() Sink {
 	return &journalSink{}
 }
 
-type tryJournalSink struct {
-	j journalSink
-	w writerSink
+type combinedSink struct {
+	sinks []Sink
 }
 
-func (sink *tryJournalSink) Log(fields Fields) {
-	if journal.Enabled() {
-		sink.j.Log(fields)
-	} else {
-		sink.w.Log(fields)
+func (sink *combinedSink) Log(fields Fields) {
+	for _, s := range sink.sinks {
+		s.Log(fields)
 	}
 }
 
-func JournalFallbackSink(out io.Writer, format string, fields []string) Sink {
-	return &tryJournalSink{
-		w: writerSink{
-			out:    out,
-			format: format,
-			fields: fields,
-		},
+func CombinedSink(writer io.Writer, format string, fields []string) Sink {
+	sinks := make([]Sink, 0)
+	sinks = append(sinks, WriterSink(writer, format, fields))
+	if journal.Enabled() {
+		sinks = append(sinks, JournalSink())
+	}
+
+	return &combinedSink{
+		sinks: sinks,
 	}
 }