scip/yadu
1
0
Fork 0
mirror of https://codeberg.org/scip/yadu.git synced 2025-12-16 20:21:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #6: support LogValuer() attributes

Browse Source
This commit is contained in:
Thomas von Dein
2024-01-22 13:44:19 +01:00
committed by T.v.Dein
parent 33798bddb3
commit 5c0aadd54a
3 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
example/example.go
View File

@@ -16,6 +16,12 @@ type Ammo struct {
Range int Range int
} }
func (a *Ammo) LogValue() slog.Value {
return slog.GroupValue(
slog.String("Forweapon", a.Forweapon),
)
}
type Enemy struct { type Enemy struct {
Alive bool Alive bool
Health int Health int
@@ -24,6 +30,12 @@ type Enemy struct {
Ammo []Ammo Ammo []Ammo
} }
func (e *Enemy) LogValue() slog.Value {
return slog.GroupValue(
slog.String("name", e.Name),
)
}
func removeTime(_ []string, a slog.Attr) slog.Attr { func removeTime(_ []string, a slog.Attr) slog.Attr {
if a.Key == slog.TimeKey { if a.Key == slog.TimeKey {
return slog.Attr{} return slog.Attr{}
@@ -47,6 +59,7 @@ func main() {
} }
slog.Info("info", "enemy", e, "spawn", 199) slog.Info("info", "enemy", e, "spawn", 199)
slog.Info("info", "ammo", &Ammo{Forweapon: "axe", Impact: 1})
slog.Info("connecting", "enemies", 100, "players", 2, "world", "600x800") slog.Info("connecting", "enemies", 100, "players", 2, "world", "600x800")
slog.Debug("debug text") slog.Debug("debug text")
slog.Error("error") slog.Error("error")

6
handler.go
View File

@@ -75,7 +75,11 @@ func (h *Handler) Handle(ctx context.Context, r slog.Record) error {
fields := make(map[string]interface{}, r.NumAttrs()) fields := make(map[string]interface{}, r.NumAttrs())
r.Attrs(func(a slog.Attr) bool { r.Attrs(func(a slog.Attr) bool {
fields[a.Key] = a.Value.Any() //fields[a.Key] = a.Value.Any()
a.Value = a.Value.Resolve()
wa := make(map[string]interface{})
h.appendAttr(wa, a)
fields[a.Key] = wa[a.Key]
return true return true
}) })

27
handler_test.go
View File

@@ -20,6 +20,12 @@ type Ammo struct {
Range float32 Range float32
} }
func (a *Ammo) LogValue() slog.Value {
return slog.GroupValue(
slog.String("Forweapon", "Use weapon: "+a.Forweapon),
)
}
type Enemy struct { type Enemy struct {
Alive bool Alive bool
Health int Health int
@@ -50,6 +56,16 @@ var tests = []Tests{
want: "ammo:", want: "ammo:",
negate: false, negate: false,
}, },
{
name: "has-ammo-logvaluer",
want: "Use weapon: Axe",
negate: false,
},
{
name: "has-ammo-logvaluer-does-resolve",
want: "impact: 50", // should NOT appear
negate: true,
},
{ {
name: "has-alive", name: "has-alive",
want: "alive: true", want: "alive: true",
@@ -144,7 +160,10 @@ func GetEnemy() *Enemy {
return &Enemy{Alive: true, Health: 10, Name: "Bodo", Body: "body\nbody\n", return &Enemy{Alive: true, Health: 10, Name: "Bodo", Body: "body\nbody\n",
Ammo: []Ammo{{Forweapon: "Railgun", Range: 400, Impact: 100, Cost: 100000}}, Ammo: []Ammo{{Forweapon: "Railgun", Range: 400, Impact: 100, Cost: 100000}},
} }
}
func GetAmmo() *Ammo {
return &Ammo{Forweapon: "Axe", Range: 50, Impact: 1, Cost: 50}
} }
func removeTime(_ []string, a slog.Attr) slog.Attr { func removeTime(_ []string, a slog.Attr) slog.Attr {
@@ -174,13 +193,13 @@ func Test(t *testing.T) {
switch tt.opts.Level { switch tt.opts.Level {
case slog.LevelDebug: case slog.LevelDebug:
logger.Debug("attack", "enemy", GetEnemy()) logger.Debug("attack", "enemy", GetEnemy(), "ammo", GetAmmo())
case slog.LevelWarn: case slog.LevelWarn:
logger.Warn("attack", "enemy", GetEnemy()) logger.Warn("attack", "enemy", GetEnemy(), "ammo", GetAmmo())
case slog.LevelError: case slog.LevelError:
logger.Error("attack", "enemy", GetEnemy()) logger.Error("attack", "enemy", GetEnemy(), "ammo", GetAmmo())
default: default:
logger.Info("attack", "enemy", GetEnemy()) logger.Info("attack", "enemy", GetEnemy(), "ammo", GetAmmo())
} }
got := buf.String() got := buf.String()