Skip to content

Commit 05f82e7

Browse files
authored
Merge pull request #73 from systemli/feature/log-queue-id
Add queue_id to policy server log messages
2 parents 69768b8 + 2419271 commit 05f82e7

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

policy.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ func (p *PolicyServer) handleRequest(ctx context.Context, req *PolicyRequest) st
163163
startTime := time.Now()
164164

165165
logger.Debug("Processing policy request",
166+
zap.String("queue_id", req.QueueID),
166167
zap.String("sender", req.Sender),
167168
zap.String("sasl_username", req.SaslUsername),
168169
zap.String("protocol", req.ProtocolState))
@@ -197,6 +198,7 @@ func (p *PolicyServer) handleRequest(ctx context.Context, req *PolicyRequest) st
197198
if err != nil {
198199
// API error - fail open (allow the message)
199200
logger.Warn("Failed to fetch quota, allowing message",
201+
zap.String("queue_id", req.QueueID),
200202
zap.String("sender", sender), zap.Error(err))
201203
policyRequestsTotal.WithLabelValues("check", "error").Inc()
202204
policyRequestDuration.WithLabelValues("check", "error").Observe(time.Since(startTime).Seconds())
@@ -219,6 +221,7 @@ func (p *PolicyServer) handleRequest(ctx context.Context, req *PolicyRequest) st
219221

220222
if !allowed {
221223
logger.Info("Rate limit exceeded",
224+
zap.String("queue_id", req.QueueID),
222225
zap.String("sender", sender),
223226
zap.Int("hour_count", hourCount),
224227
zap.Int("day_count", dayCount),
@@ -233,6 +236,7 @@ func (p *PolicyServer) handleRequest(ctx context.Context, req *PolicyRequest) st
233236
}
234237

235238
logger.Debug("Message allowed",
239+
zap.String("queue_id", req.QueueID),
236240
zap.String("sender", sender),
237241
zap.Int("hour_count", hourCount),
238242
zap.Int("day_count", dayCount),

0 commit comments

Comments
 (0)