Skip to content

Commit 3e6b523

Browse files
AchoArnoldAchoArnold
committed
Fix heartbeat logging when monitor doesn't exist
1 parent 45bc910 commit 3e6b523

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

‎api/pkg/services/heartbeat_service.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ func (service *HeartbeatService) Store(ctx context.Context, params HeartbeatStor
100100
ctxLogger.Info(fmt.Sprintf("heartbeat saved with id [%s] for user [%s]", heartbeat.ID, heartbeat.UserID))
101101

102102
monitor, err := service.monitorRepository.Load(ctx, params.UserID, params.Owner)
103+
if stacktrace.GetCode(err) == repositories.ErrCodeNotFound {
104+
ctxLogger.Info(fmt.Sprintf("heartbeat monitor does not exist for owner [%s] and user [%s]", params.Owner, params.UserID))
105+
return heartbeat, nil
106+
}
103107
if err != nil {
104108
msg := fmt.Sprintf("cannot load heartbeat monitor for owner [%s] and user [%s]", params.Owner, params.UserID)
105109
ctxLogger.Error(stacktrace.Propagate(err, msg))

‎api/pkg/services/message_service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ func (service *MessageService) handleMessageDeliveredEvent(ctx context.Context,
318318
}
319319

320320
if _, err = service.eventDispatcher.DispatchWithTimeout(ctx, event, time.Second); err != nil {
321-
msg := fmt.Sprintf("cannot dispatch event type [%s] and id [%s]", event.Type(), event.ID())
321+
msg := fmt.Sprintf("cannot dispatch event type [%s] and id [%s] for message [%s]", event.Type(), event.ID(), message.ID)
322322
return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
323323
}
324324
return nil

0 commit comments

Comments
 (0)