multipleof4/ntfy
1
0
Fork 0
mirror of https://github.com/multipleof4/ntfy.git synced 2026-10-16 08:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make logs easier to read

Browse Source
This commit is contained in:
binwiederhier
2026-05-17 17:27:38 -04:00
parent acb4c1b3cc
commit a1d880aab9
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/visitor.go
+10 -12
View File
@@ -2,6 +2,7 @@ package server
import ( import (
"fmt" "fmt"
"math"
"net/netip" "net/netip"
"sync" "sync"
"time" "time"
@@ -154,14 +155,13 @@ func (v *visitor) Context() log.Context {
func (v *visitor) contextNoLock() log.Context { func (v *visitor) contextNoLock() log.Context {
info := v.infoLightNoLock() info := v.infoLightNoLock()
fields := log.Context{ fields := log.Context{
"visitor_id": visitorID(v.ip, v.user, v.config), "visitor_id": visitorID(v.ip, v.user, v.config),
"visitor_ip": v.ip.String(), "visitor_ip": v.ip.String(),
"visitor_seen": util.FormatTime(v.seen), "visitor_seen": util.FormatTime(v.seen),
"visitor_messages": info.Stats.Messages, "visitor_messages": info.Stats.Messages,
"visitor_messages_limit": info.Limits.MessageLimit, "visitor_messages_limit": info.Limits.MessageLimit,
"visitor_messages_remaining": info.Stats.MessagesRemaining, "visitor_messages_remaining": info.Stats.MessagesRemaining,
"visitor_request_limiter_limit": v.requestLimiter.Limit(), "visitor_requests_remaining": int64(math.Floor(v.requestLimiter.Tokens())),
"visitor_request_limiter_tokens": v.requestLimiter.Tokens(),
} }
if v.config.SMTPSenderFrom != "" { if v.config.SMTPSenderFrom != "" {
fields["visitor_emails"] = info.Stats.Emails fields["visitor_emails"] = info.Stats.Emails
@@ -174,12 +174,10 @@ func (v *visitor) contextNoLock() log.Context {
fields["visitor_calls_remaining"] = info.Stats.CallsRemaining fields["visitor_calls_remaining"] = info.Stats.CallsRemaining
} }
if v.authLimiter != nil { if v.authLimiter != nil {
fields["visitor_auth_limiter_limit"] = v.authLimiter.Limit() fields["visitor_auth_attempts_remaining"] = int64(math.Floor(v.authLimiter.Tokens()))
fields["visitor_auth_limiter_tokens"] = v.authLimiter.Tokens()
} }
if v.topicCreationLimiter != nil { if v.topicCreationLimiter != nil {
fields["visitor_topic_creation_limiter_limit"] = v.topicCreationLimiter.Limit() fields["visitor_topic_creations_remaining"] = int64(math.Floor(v.topicCreationLimiter.Tokens()))
fields["visitor_topic_creation_limiter_tokens"] = v.topicCreationLimiter.Tokens()
} }
if v.user != nil { if v.user != nil {
fields["user_id"] = v.user.ID fields["user_id"] = v.user.ID