Expose loglevels with + in kv pairs

influxdata · Oct 6, 2017 · 4007a40 · 4007a40
1 parent e083476
commit 4007a40
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/cmd/kapacitor/main.go b/cmd/kapacitor/main.go
@@ -2298,7 +2298,8 @@ func logsUsage() {
 
 	Watch arbitrary kapacitor logs.
 
-		$ kapacitor logs service=http lvl=info
+		$ kapacitor logs service=http lvl=error
+		$ kapacitor logs service=http lvl=info+
 `
 	fmt.Fprintln(os.Stderr, u)
 }

diff --git a/services/diagnostic/api.go b/services/diagnostic/api.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/influxdata/kapacitor/services/httpd"
 	"github.com/influxdata/kapacitor/uuid"
@@ -85,19 +86,25 @@ func (s *SessionService) NewLogger() *sessionsLogger {
 func (s *SessionService) handleSessions(w http.ResponseWriter, r *http.Request) {
 	params := r.URL.Query()
 	tags := []tag{}
+	var level Level
 
 	for k, v := range params {
 		if len(v) != 1 {
 			httpd.HttpError(w, "query params cannot contain duplicate pairs", true, http.StatusBadRequest)
 			return
 		}
 
+		if k == "lvl" && strings.HasSuffix(v[0], "+") {
+			level = logLevelFromName(strings.TrimSuffix(v[0], "+"))
+			continue
+		}
+
 		tags = append(tags, tag{key: k, value: v[0]})
 	}
 
 	contentType := r.Header.Get("Content-Type")
 
-	session := s.SessionsStore.Create(w, contentType, tags)
+	session := s.SessionsStore.Create(w, contentType, level, tags)
 	defer s.SessionsStore.Delete(session)
 
 	header := w.Header()

diff --git a/services/diagnostic/log_test.go b/services/diagnostic/log_test.go
@@ -440,7 +440,7 @@ func TestSessionsLoggerWithoutContext(t *testing.T) {
 	service := diagnostic.NewSessionService()
 	// TODO: we need ths?
 	_ = service.NewLogger()
-	session := service.SessionsStore.Create(&httpResponseWriter{buf: buf}, "application/json", nil)
+	session := service.SessionsStore.Create(&httpResponseWriter{buf: buf}, "application/json", diagnostic.DebugLevel, nil)
 	defer service.SessionsStore.Delete(session)
 
 	tests := []struct {

diff --git a/services/diagnostic/sessions.go b/services/diagnostic/sessions.go
@@ -11,7 +11,7 @@ import (
 )
 
 type SessionsStore interface {
-	Create(w http.ResponseWriter, contentType string, tags []tag) *Session
+	Create(w http.ResponseWriter, contentType string, level Level, tags []tag) *Session
 	Delete(s *Session) error
 	Each(func(*Session))
 	SetDiagnostic(Diagnostic)
@@ -31,7 +31,7 @@ func (kv *sessionsStore) SetDiagnostic(d Diagnostic) {
 
 }
 
-func (kv *sessionsStore) Create(w http.ResponseWriter, contentType string, tags []tag) *Session {
+func (kv *sessionsStore) Create(w http.ResponseWriter, contentType string, logLevel Level, tags []tag) *Session {
 	kv.mu.Lock()
 
 	wf, ok := w.(WriteFlusher)
@@ -43,6 +43,7 @@ func (kv *sessionsStore) Create(w http.ResponseWriter, contentType string, tags
 		id:          uuid.New(),
 		tags:        tags,
 		w:           wf,
+		level:       logLevel,
 		contentType: contentType,
 	}
 
@@ -92,6 +93,8 @@ type Session struct {
 	mu sync.Mutex
 	id uuid.UUID
 
+	level Level
+
 	tags []tag
 
 	buf         bytes.Buffer
@@ -100,25 +103,25 @@ type Session struct {
 }
 
 func (s *Session) Error(msg string, context, fields []Field) {
-	if match(s.tags, msg, "error", context, fields) {
+	if s.level <= ErrorLevel && match(s.tags, msg, "error", context, fields) {
 		s.Log(time.Now(), "error", msg, context, fields)
 	}
 }
 
 func (s *Session) Warn(msg string, context, fields []Field) {
-	if match(s.tags, msg, "warn", context, fields) {
+	if s.level <= WarnLevel && match(s.tags, msg, "warn", context, fields) {
 		s.Log(time.Now(), "warn", msg, context, fields)
 	}
 }
 
 func (s *Session) Debug(msg string, context, fields []Field) {
-	if match(s.tags, msg, "debug", context, fields) {
+	if s.level <= DebugLevel && match(s.tags, msg, "debug", context, fields) {
 		s.Log(time.Now(), "debug", msg, context, fields)
 	}
 }
 
 func (s *Session) Info(msg string, context, fields []Field) {
-	if match(s.tags, msg, "info", context, fields) {
+	if s.level <= InfoLevel && match(s.tags, msg, "info", context, fields) {
 		s.Log(time.Now(), "info", msg, context, fields)
 	}
 }