Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions internal/pkg/source/entry.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package source
import (
"bytes"
"encoding/json"
"strings"
"unicode"

"github.com/charmbracelet/bubbles/table"
"github.com/valyala/fastjson"
Expand Down Expand Up @@ -79,15 +81,29 @@ func ParseLogEntry(line json.RawMessage) LogEntry {
return LogEntry{
Line: line,
Time: "-",
Message: string(line),
Message: formatMessage(string(line)),
Level: LevelUnknown,
}
}

return LogEntry{
Line: line,
Time: extractTime(value),
Message: extractMessage(value),
Time: formatMessage(extractTime(value)),
Message: formatMessage(extractMessage(value)),
Level: extractLevel(value),
}
}

func formatMessage(msg string) string {
msg = strings.NewReplacer("\n", "\\n", "\t", "\\t").Replace(msg)

msg = strings.Map(func(r rune) rune {
if unicode.IsPrint(r) {
return r
}

return -1
}, msg)

return msg
}
8 changes: 8 additions & 0 deletions internal/pkg/source/entry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ func TestParseLogEntry(t *testing.T) {

assert.Equal(t, "msg", logEntry.Message)
},
}, {
Name: "message_special_rune",
JSON: `{"message":"mes` + string(rune(1)) + `sage"}`,
Assert: func(tb testing.TB, logEntry source.LogEntry) {
tb.Helper()

assert.Equal(t, "message", logEntry.Message)
},
}, {
Name: "error",
JSON: `{"error":"error"}`,
Expand Down
4 changes: 2 additions & 2 deletions internal/pkg/source/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
func extractTime(value *fastjson.Value) string {
timeValue := extractValue(value, "timestamp", "time", "t")
if timeValue != "" {
return strings.TrimSpace(timeValue)
return formatMessage(strings.TrimSpace(timeValue))
}

return "-"
Expand All @@ -19,7 +19,7 @@ func extractTime(value *fastjson.Value) string {
func extractLevel(value *fastjson.Value) Level {
level := extractValue(value, "level", "lvl")

return ParseLevel(level)
return ParseLevel(formatMessage(level))
}

func extractValue(value *fastjson.Value, keys ...string) string {
Expand Down