Skip to content

Commit ec11fd4

Browse files
authored
Calm down sublogger style (#171)
* Fix test logger
1 parent cd356cb commit ec11fd4

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

internal/entryhuman/entry.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ const TimeFormat = "2006-01-02 15:04:05.000"
3838
var (
3939
renderer = lipgloss.NewRenderer(os.Stdout, termenv.WithUnsafe())
4040

41-
loggerNameStyle = renderer.NewStyle().Foreground(lipgloss.Color("#A47DFF"))
42-
timeStyle = renderer.NewStyle().Foreground(lipgloss.Color("#606366"))
41+
timeStyle = renderer.NewStyle().Foreground(lipgloss.Color("#606366"))
4342
)
4443

4544
func render(w io.Writer, st lipgloss.Style, s string) string {
@@ -108,9 +107,8 @@ func Fmt(
108107
buf.WriteString(" ")
109108

110109
if len(ent.LoggerNames) > 0 {
111-
loggerName := "(" + quoteKey(strings.Join(ent.LoggerNames, ".")) + ")"
112-
buf.WriteString(render(termW, loggerNameStyle, loggerName))
113-
buf.WriteString(tab)
110+
loggerName := quoteKey(strings.Join(ent.LoggerNames, ".")) + ": "
111+
buf.WriteString(loggerName)
114112
}
115113

116114
var multilineKey string

internal/entryhuman/entry_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ func TestEntry(t *testing.T) {
6464
"named",
6565
slog.SinkEntry{
6666
Level: slog.LevelWarn,
67-
LoggerNames: []string{"named", "meow"},
67+
LoggerNames: []string{"some", "cat"},
68+
Message: "meow",
69+
Fields: slog.M(
70+
slog.F("breath", "stinky"),
71+
),
6872
},
6973
},
7074
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0001-01-01 00:00:00.000 [warn] (named.meow)
1+
0001-01-01 00:00:00.000 [warn] some.cat: meow breath=stinky

s_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ func TestStdlib(t *testing.T) {
2323
et, rest, err := entryhuman.StripTimestamp(b.String())
2424
assert.Success(t, "strip timestamp", err)
2525
assert.False(t, "timestamp", et.IsZero())
26-
assert.Equal(t, "entry", " [info] (stdlib) stdlib hi=we\n", rest)
26+
assert.Equal(t, "entry", " [info] stdlib: stdlib hi=we\n", rest)
2727
}

sloggers/slogtest/t.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,11 @@ func (ts *testSink) LogEntry(ctx context.Context, ent slog.SinkEntry) {
7474
return
7575
}
7676

77-
var s strings.Builder
77+
var sb strings.Builder
7878
// The testing package logs to stdout and not stderr.
79-
entryhuman.Fmt(&s, os.Stdout, ent)
79+
entryhuman.Fmt(&sb, os.Stdout, ent)
80+
81+
s := sb.String()
8082

8183
switch ent.Level {
8284
case slog.LevelDebug, slog.LevelInfo, slog.LevelWarn:

0 commit comments

Comments
 (0)