Merge branch 'master' of https://github.com/micro/go-micro into kubernetes-logging

debug/log/log.go

@@ -2,8 +2,6 @@
 package log
 
 import (
-	"fmt"
-	"os"
 	"time"
 )
 
@@ -19,11 +17,11 @@ var (
 // Log is event log
 type Log interface {
 	// Read reads log entries from the logger
-	Read(...ReadOption) []Record
+	Read(...ReadOption) ([]Record, error)
 	// Write writes records to log
-	Write(Record)
+	Write(Record) error
 	// Stream log records
-	Stream() (<-chan Record, chan bool)
+	Stream() (Stream, error)
 }
 
 // Record is log record entry
@@ -36,6 +34,7 @@ type Record struct {
 	Metadata map[string]string `json:"metadata"`
 }
 
+<<<<<<< HEAD
 // Level is a log level
 type Level int
 
@@ -176,4 +175,9 @@ func SetPrefix(p string) {
 // Set service name
 func SetName(name string) {
 	prefix = fmt.Sprintf("[%s]", name)
+=======
+type Stream interface {
+	Chan() <-chan Record
+	Stop() error
+>>>>>>> 50d5c6402b1e2bea64476a969b613b7c685d6f8e
 }