Skip to content

Commit 1905309

Browse files
chore: add logs to debug
1 parent 058e99a commit 1905309

4 files changed

Lines changed: 31 additions & 17 deletions

File tree

services/mqtt/client/pubsub.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ package client
33
import (
44
"context"
55
"fmt"
6-
76
"github.com/gojek/courier-go"
87
"github.com/gojek/courier-go/consul"
9-
"github.com/goto/raccoon/clients/go/log"
108
"github.com/goto/raccoon/config"
9+
"github.com/goto/raccoon/logger"
1110
)
1211

1312
// MqttPubSubClient wraps a courier MQTT client with start/stop lifecycle management.
@@ -52,7 +51,7 @@ func NewMqttPubSubClient(ctx context.Context, handler courier.MessageHandler, cl
5251
return nil, fmt.Errorf("failed to initialize MQTT client: %w", err)
5352
}
5453

55-
log.Infof("MQTT client initialized successfully for clientID=%s", clientID)
54+
logger.Infof("MQTT client initialized successfully for clientID=%s and client %v", clientID, client)
5655
return &MqttPubSubClient{client: client}, nil
5756
}
5857

@@ -61,26 +60,27 @@ func registerHandler(ctx context.Context, handler courier.MessageHandler) func(c
6160
return func(ps courier.PubSub) {
6261
topic := config.ServerMQTT.ConsumerConfig.TopicFormat
6362
if err := ps.Subscribe(ctx, topic, handler, courier.QOSZero); err != nil {
64-
log.Errorf("failed to register MQTT handler for topic %q: %v", topic, err)
63+
logger.Errorf("failed to register MQTT handler for topic %q: %v", topic, err)
6564
} else {
66-
log.Infof("successfully registered MQTT handler for topic %q", topic)
65+
logger.Infof("successfully registered MQTT handler for topic %q", topic)
6766
}
6867
}
6968
}
7069

7170
// Start begins the MQTT client operation.
7271
func (m *MqttPubSubClient) Start() error {
7372
if err := m.client.Start(); err != nil {
73+
logger.Infof("MQTT client start failed due to %v", err)
7474
return fmt.Errorf("failed to start MQTT client: %w", err)
7575
}
76-
log.Infof("MQTT client started successfully")
76+
logger.Infof("MQTT client started successfully")
7777
return nil
7878
}
7979

8080
// Stop gracefully stops the MQTT client.
8181
func (m *MqttPubSubClient) Stop() error {
8282
m.client.Stop()
83-
log.Infof("MQTT client stopped successfully")
83+
logger.Infof("MQTT client stopped successfully")
8484
return nil
8585
}
8686

services/mqtt/consumer.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package mqtt
22

33
import (
44
"fmt"
5+
"github.com/goto/raccoon/logger"
56
)
67

78
// Consumer wraps a PubSubClient and provides lifecycle control.
@@ -21,23 +22,27 @@ func NewConsumer(client PubSubClient) *Consumer {
2122
return &Consumer{client: client}
2223
}
2324

24-
// Start initializes and starts the underlying PubSubClient.
25-
func (c *Consumer) Start() error {
25+
// Init initializes and starts the underlying PubSubClient.
26+
func (c *Consumer) Init() error {
2627
if err := c.client.Start(); err != nil {
2728
return fmt.Errorf("failed to start consumer: %w", err)
29+
} else {
30+
logger.Info("[consumer:] client started sucessfully !!")
2831
}
2932
return nil
3033
}
3134

32-
// Stop gracefully shuts down the underlying PubSubClient.
33-
func (c *Consumer) Stop() error {
35+
// Shutdown gracefully shuts down the underlying PubSubClient.
36+
func (c *Consumer) Shutdown() error {
3437
if err := c.client.Stop(); err != nil {
3538
return fmt.Errorf("failed to stop consumer: %w", err)
39+
} else {
40+
logger.Info("[consumer:] client stopped sucessfully !!")
3641
}
3742
return nil
3843
}
3944

40-
// IsConnected checks the connection health of underlying PubSubClient.
41-
func (c *Consumer) IsConnected() bool {
45+
// IsHealthy checks the connection health of underlying PubSubClient.
46+
func (c *Consumer) IsHealthy() bool {
4247
return c.client.IsConnected()
4348
}

services/mqtt/service.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"errors"
66
"fmt"
77
"github.com/goto/raccoon/health"
8+
"github.com/goto/raccoon/logger"
89
"os"
910

1011
"github.com/goto/raccoon/collection"
@@ -38,7 +39,7 @@ func NewMQTTService(collector collection.Collector, ctx context.Context) *Servic
3839
startupErr: fmt.Errorf("failed to create MQTT client for %s: %w", clientID, err),
3940
}
4041
}
41-
42+
logger.Infof("[service:] MQTT client created with ID %v", clientID)
4243
consumers = append(consumers, NewConsumer(mqttClient))
4344
}
4445
s := &Service{Collector: collector, consumers: consumers}
@@ -50,13 +51,16 @@ func NewMQTTService(collector collection.Collector, ctx context.Context) *Servic
5051

5152
// Init starts all consumers.
5253
func (s *Service) Init(ctx context.Context) error {
54+
logger.Infof("[service]: MQTT service init called")
5355
if s.startupErr != nil {
5456
return fmt.Errorf("mqtt service startup failed: %w", s.startupErr)
5557
}
5658

5759
for _, con := range s.consumers {
58-
if err := con.Start(); err != nil {
60+
if err := con.Init(); err != nil {
5961
return fmt.Errorf("failed to start consumer: %w", err)
62+
} else {
63+
logger.Info("[service:] MQTT consumer started")
6064
}
6165
}
6266

@@ -71,8 +75,10 @@ func (*Service) Name() string {
7175
// Shutdown stops all consumers gracefully.
7276
func (s *Service) Shutdown(ctx context.Context) error {
7377
for _, con := range s.consumers {
74-
if err := con.Stop(); err != nil {
78+
if err := con.Shutdown(); err != nil {
7579
return fmt.Errorf("failed to stop consumer: %w", err)
80+
} else {
81+
logger.Info("[service:] MQTT consumer stopped")
7682
}
7783
}
7884
return nil
@@ -81,8 +87,10 @@ func (s *Service) Shutdown(ctx context.Context) error {
8187
// HealthCheck checks the health all consumers.
8288
func (s *Service) HealthCheck() error {
8389
for _, con := range s.consumers {
84-
if status := con.IsConnected(); !status {
90+
if status := con.IsHealthy(); !status {
8591
return errors.New("consumer connection is broken")
92+
} else {
93+
logger.Info("[service:] Health check pass")
8694
}
8795
}
8896
return nil

services/services.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ func (s *Services) Start(ctx context.Context, cancel context.CancelFunc) {
3030
go func() {
3131
logger.Infof("%s Server --> startServers", i.Name())
3232
err := i.Init(ctx)
33+
logger.Errorf("service start up error %v", err)
3334
if err != nil && err != http.ErrServerClosed {
3435
cancel()
3536
}

0 commit comments

Comments
 (0)