refactor: update logs

This commit is contained in:
lorsan
2026-04-11 18:43:56 +03:00
parent dc30d30fa1
commit 4ce5f82069
3 changed files with 17 additions and 9 deletions
+7 -7
View File
@@ -2,30 +2,29 @@ package rpc
import ( import (
"context" "context"
"fmt"
pb "github.com/lorsanstand/HomeOps-Hub/api/gen/homeops" pb "github.com/lorsanstand/HomeOps-Hub/api/gen/homeops"
"github.com/lorsanstand/HomeOps-Hub/internal/agent/domain" "github.com/lorsanstand/HomeOps-Hub/internal/agent/domain"
"github.com/rs/zerolog"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
type Connection struct { type Connection struct {
hub pb.HubClient hub pb.HubClient
conn *grpc.ClientConn conn *grpc.ClientConn
log zerolog.Logger
} }
func NewConnectAgent(address string) (*Connection, error) { func NewConnectAgent(conn *grpc.ClientConn, logger zerolog.Logger) *Connection {
conn, err := grpc.NewClient(address) logger = logger.With().Str("component", "agent.rpc").Logger()
if err != nil {
return nil, fmt.Errorf("failed connection hub: %v", err)
}
client := pb.NewHubClient(conn) client := pb.NewHubClient(conn)
return &Connection{hub: client, conn: conn}, nil return &Connection{hub: client, conn: conn, log: logger}
} }
func (c *Connection) Close() error { func (c *Connection) Close() error {
c.log.Warn().Msg("connection close")
return c.conn.Close() return c.conn.Close()
} }
@@ -35,5 +34,6 @@ func (c *Connection) Hub() pb.HubClient {
func (c *Connection) RegisterAgent(ctx context.Context, RegisterData domain.RegisterAgentData) (domain.RegisterAgentDataResponse, error) { func (c *Connection) RegisterAgent(ctx context.Context, RegisterData domain.RegisterAgentData) (domain.RegisterAgentDataResponse, error) {
ResponseData, err := c.Hub().RegisterAgent(ctx, new(toAgentRegisterRequest(RegisterData))) ResponseData, err := c.Hub().RegisterAgent(ctx, new(toAgentRegisterRequest(RegisterData)))
c.log.Info().Msg("register agent")
return toAgentRegisterDataResponse(ResponseData), err return toAgentRegisterDataResponse(ResponseData), err
} }
@@ -0,0 +1 @@
package collector
@@ -5,6 +5,7 @@ import (
"github.com/moby/moby/api/types" "github.com/moby/moby/api/types"
"github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/container"
"github.com/rs/zerolog"
) )
type dockerAPI interface { type dockerAPI interface {
@@ -14,18 +15,24 @@ type dockerAPI interface {
type DockerService struct { type DockerService struct {
dockerClient dockerAPI dockerClient dockerAPI
log zerolog.Logger
} }
func NewDockerService(api dockerAPI) *DockerService { func NewDockerService(api dockerAPI, logger zerolog.Logger) *DockerService {
return &DockerService{dockerClient: api} return &DockerService{
dockerClient: api,
log: logger.With().Str("component", "agent.serivce.docker").Logger(),
}
} }
func (d *DockerService) CheckDockerDaemon(ctx context.Context) error { func (d *DockerService) CheckDockerDaemon(ctx context.Context) error {
_, err := d.dockerClient.Ping(ctx) _, err := d.dockerClient.Ping(ctx)
d.log.Debug().Msg("check docker")
return err return err
} }
func (d *DockerService) ContainersList(ctx context.Context) ([]container.Summary, error) { func (d *DockerService) ContainersList(ctx context.Context) ([]container.Summary, error) {
ContainersList, err := d.dockerClient.ContainerList(ctx, container.ListOptions{}) ContainersList, err := d.dockerClient.ContainerList(ctx, container.ListOptions{})
d.log.Debug().Msg("get container list")
return ContainersList, err return ContainersList, err
} }