infra: add logging wrapping
Resolves issues with gcp cloud logging quirks such as field names
This commit is contained in:
@@ -4,7 +4,8 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
|
||||
"github.com/flowy-live/llink/internal/utils/flog"
|
||||
|
||||
"github.com/flowy-live/llink/internal/network"
|
||||
)
|
||||
@@ -55,7 +56,7 @@ func NewNotifier(networkR network.Reader, tokens Service, expo *ExpoClient) *Not
|
||||
|
||||
func (n *Notifier) NotifyParticleCreated(ctx context.Context, in NotifyInput) error {
|
||||
if in.NetworkID == "" || in.ParticleID == "" {
|
||||
slog.Info("pushnotify: skip — missing ids",
|
||||
flog.Info("pushnotify: skip — missing ids",
|
||||
"networkID", in.NetworkID,
|
||||
"particleID", in.ParticleID,
|
||||
)
|
||||
@@ -71,7 +72,7 @@ func (n *Notifier) NotifyParticleCreated(ctx context.Context, in NotifyInput) er
|
||||
recipientsBeforeSenderFilter := len(recipients)
|
||||
recipients = filterOut(recipients, in.SenderHumanID)
|
||||
if len(recipients) == 0 {
|
||||
slog.Info("pushnotify: skip — no recipients",
|
||||
flog.Info("pushnotify: skip — no recipients",
|
||||
"networkID", in.NetworkID,
|
||||
"particleID", in.ParticleID,
|
||||
"senderHumanID", in.SenderHumanID,
|
||||
@@ -87,7 +88,7 @@ func (n *Notifier) NotifyParticleCreated(ctx context.Context, in NotifyInput) er
|
||||
return fmt.Errorf("token lookup: %w", err)
|
||||
}
|
||||
if len(tokens) == 0 {
|
||||
slog.Info("pushnotify: skip — no tokens for recipients",
|
||||
flog.Info("pushnotify: skip — no tokens for recipients",
|
||||
"networkID", in.NetworkID,
|
||||
"particleID", in.ParticleID,
|
||||
"recipients", len(recipients),
|
||||
@@ -98,7 +99,7 @@ func (n *Notifier) NotifyParticleCreated(ctx context.Context, in NotifyInput) er
|
||||
|
||||
msgs := buildMessages(tokens, in)
|
||||
tickets, sendErr := n.expo.Send(ctx, msgs)
|
||||
slog.Info("pushnotify: dispatch",
|
||||
flog.Info("pushnotify: dispatch",
|
||||
"networkID", in.NetworkID,
|
||||
"particleID", in.ParticleID,
|
||||
"recipients", len(recipients),
|
||||
@@ -127,14 +128,14 @@ func (n *Notifier) cleanupDeadTokens(ctx context.Context, msgs []Message, ticket
|
||||
code, _ := t.Details["error"].(string)
|
||||
if code != ExpoErrorDeviceNotRegistered {
|
||||
if t.Status == "error" {
|
||||
slog.Warn("pushnotify: ticket error", "code", code, "message", t.Message, "to", msgs[i].To)
|
||||
flog.Warn("pushnotify: ticket error", "code", code, "message", t.Message, "to", msgs[i].To)
|
||||
}
|
||||
continue
|
||||
}
|
||||
if err := n.tokens.DeleteByToken(ctx, msgs[i].To); err != nil && !errors.Is(err, ErrNotFound) {
|
||||
slog.Error("pushnotify: failed to delete dead token", "error", err, "token", msgs[i].To)
|
||||
flog.Error("pushnotify: failed to delete dead token", "error", err, "token", msgs[i].To)
|
||||
} else {
|
||||
slog.Info("pushnotify: removed unregistered token", "token", msgs[i].To)
|
||||
flog.Info("pushnotify: removed unregistered token", "token", msgs[i].To)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user