Reorganize

services/diagnostic/api.go

@@ -82,36 +82,14 @@ func (s *SessionService) handleSessions(w http.ResponseWriter, r *http.Request)
 	contentType := r.Header.Get("Content-Type")
 
 	// TODO: do better verification of content type here
-	session := s.SessionsStore.Create(&httpWriteFlusher{w: w}, contentType, tags)
+	session := s.SessionsStore.Create(w, contentType, tags)
 	defer s.SessionsStore.Delete(session)
 
 	header := w.Header()
 	header.Add("Transfer-Encoding", "chunked")
+	header.Add("Content-Type", r.Header.Get("Content-Type"))
 	w.WriteHeader(http.StatusOK)
 	// TODO: set content headers
 
 	<-r.Context().Done()
 }
-
-type WriteFlusher interface {
-	Write([]byte) (int, error)
-	Flush() error
-}
-
-type httpWriteFlusher struct {
-	w http.ResponseWriter
-}
-
-func (h *httpWriteFlusher) Write(buf []byte) (int, error) {
-	return h.w.Write(buf)
-}
-func (h *httpWriteFlusher) Flush() error {
-	flusher, ok := h.w.(http.Flusher)
-	if !ok {
-		return errors.New("failed to coerce to http.Flusher")
-	}
-
-	flusher.Flush()
-
-	return nil
-}

services/diagnostic/field.go

@@ -8,12 +8,6 @@ import (
 	"time"
 )
 
-type Writer interface {
-	Write([]byte) (int, error)
-	WriteByte(byte) error
-	WriteString(string) (int, error)
-}
-
 func writeString(w Writer, s string) (n int, err error) {
 	var m int
 	// TODO: revisit

services/diagnostic/handlers.go

@@ -38,63 +38,6 @@ import (
 	plog "github.com/prometheus/common/log"
 )
 
-type Logger interface {
-	Error(msg string, ctx ...Field)
-	Warn(msg string, ctx ...Field)
-	Debug(msg string, ctx ...Field)
-	Info(msg string, ctx ...Field)
-	With(ctx ...Field) Logger
-}
-
-type MultiLogger struct {
-	loggers []Logger
-}
-
-func NewMultiLogger(loggers ...Logger) *MultiLogger {
-	return &MultiLogger{
-		loggers: loggers,
-	}
-}
-
-func (l *MultiLogger) Error(msg string, ctx ...Field) {
-	for _, logger := range l.loggers {
-		logger.Error(msg, ctx...)
-	}
-}
-
-func (l *MultiLogger) Warn(msg string, ctx ...Field) {
-	for _, logger := range l.loggers {
-		logger.Warn(msg, ctx...)
-	}
-}
-
-func (l *MultiLogger) Debug(msg string, ctx ...Field) {
-	for _, logger := range l.loggers {
-		logger.Debug(msg, ctx...)
-	}
-}
-
-func (l *MultiLogger) Info(msg string, ctx ...Field) {
-	for _, logger := range l.loggers {
-		logger.Info(msg, ctx...)
-	}
-}
-
-func (l *MultiLogger) With(ctx ...Field) Logger {
-	loggers := []Logger{}
-	for _, logger := range l.loggers {
-		loggers = append(loggers, logger.With(ctx...))
-	}
-
-	return NewMultiLogger(loggers...)
-}
-
-// session logger
-// api and implements session
-
-//api server
-// uses session logger
-
 func Err(l Logger, msg string, err error, ctx []keyvalue.T) {
 	if len(ctx) == 0 {
 		l.Error(msg, Error(err))

services/diagnostic/log.go

@@ -19,6 +19,68 @@ const (
 	ErrorLevel
 )
 
+type Logger interface {
+	Error(msg string, ctx ...Field)
+	Warn(msg string, ctx ...Field)
+	Debug(msg string, ctx ...Field)
+	Info(msg string, ctx ...Field)
+	With(ctx ...Field) Logger
+}
+
+type Writer interface {
+	Write([]byte) (int, error)
+	WriteByte(byte) error
+	WriteString(string) (int, error)
+}
+
+type WriteFlusher interface {
+	Write([]byte) (int, error)
+	Flush() error
+}
+
+type MultiLogger struct {
+	loggers []Logger
+}
+
+func NewMultiLogger(loggers ...Logger) *MultiLogger {
+	return &MultiLogger{
+		loggers: loggers,
+	}
+}
+
+func (l *MultiLogger) Error(msg string, ctx ...Field) {
+	for _, logger := range l.loggers {
+		logger.Error(msg, ctx...)
+	}
+}
+
+func (l *MultiLogger) Warn(msg string, ctx ...Field) {
+	for _, logger := range l.loggers {
+		logger.Warn(msg, ctx...)
+	}
+}
+
+func (l *MultiLogger) Debug(msg string, ctx ...Field) {
+	for _, logger := range l.loggers {
+		logger.Debug(msg, ctx...)
+	}
+}
+
+func (l *MultiLogger) Info(msg string, ctx ...Field) {
+	for _, logger := range l.loggers {
+		logger.Info(msg, ctx...)
+	}
+}
+
+func (l *MultiLogger) With(ctx ...Field) Logger {
+	loggers := []Logger{}
+	for _, logger := range l.loggers {
+		loggers = append(loggers, logger.With(ctx...))
+	}
+
+	return NewMultiLogger(loggers...)
+}
+
 func defaultLevelF(lvl Level) bool {
 	return true
 }
@@ -104,6 +166,43 @@ func (l *ServerLogger) Log(now time.Time, level string, msg string, ctx []Field)
 	l.w.Flush()
 }
 
+type sessionsLogger struct {
+	store   SessionsStore
+	context []Field
+}
+
+func (s *sessionsLogger) Error(msg string, ctx ...Field) {
+	s.store.Each(func(sn *Session) {
+		sn.Error(msg, s.context, ctx)
+	})
+}
+
+func (s *sessionsLogger) Warn(msg string, ctx ...Field) {
+	s.store.Each(func(sn *Session) {
+		sn.Warn(msg, s.context, ctx)
+	})
+}
+
+func (s *sessionsLogger) Debug(msg string, ctx ...Field) {
+	s.store.Each(func(sn *Session) {
+		sn.Warn(msg, s.context, ctx)
+	})
+}
+
+func (s *sessionsLogger) Info(msg string, ctx ...Field) {
+	s.store.Each(func(sn *Session) {
+		sn.Info(msg, s.context, ctx)
+	})
+}
+
+func (s *sessionsLogger) With(ctx ...Field) Logger {
+	// TODO: this needs some kind of locking
+	return &sessionsLogger{
+		store:   s.store,
+		context: append(s.context, ctx...),
+	}
+}
+
 // TODO: actually care about errors?
 func writeLogfmt(w Writer, now time.Time, level string, msg string, context, fields []Field) {
 
@@ -143,7 +242,6 @@ func writeLogfmtMessage(w Writer, msg string) {
 }
 
 // TODO: actually care about errors?
-// TODO: should we ensure non-duplicate keys?
 func writeJSON(w Writer, now time.Time, level string, msg string, context, fields []Field) {
 
 	w.WriteByte('{')

services/diagnostic/log_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 	"reflect"
 	"strconv"
 	"testing"
@@ -439,7 +440,7 @@ func TestSessionsLoggerWithoutContext(t *testing.T) {
 	service := diagnostic.NewSessionService()
 	// TODO: we need ths?
 	_ = service.NewLogger()
-	session := service.SessionsStore.Create(&writeFlusher{buf: buf}, "application/json", nil)
+	session := service.SessionsStore.Create(&httpResponseWriter{buf: buf}, "application/json", nil)
 	defer service.SessionsStore.Delete(session)
 
 	tests := []struct {
@@ -791,14 +792,16 @@ func jsonStr(o interface{}) (string, error) {
 	return string(b), err
 }
 
-type writeFlusher struct {
+type httpResponseWriter struct {
 	buf *bytes.Buffer
 }
 
-func (w *writeFlusher) Write(b []byte) (int, error) {
-	return w.buf.Write(b)
+func (w *httpResponseWriter) Header() http.Header {
+	return http.Header{}
 }
 
-func (w *writeFlusher) Flush() error {
-	return nil
+func (w *httpResponseWriter) Write(b []byte) (int, error) {
+	return w.buf.Write(b)
 }
+
+func (w *httpResponseWriter) WriteHeader(n int) {}