diff --git a/internal/agent/rpc/client.go b/internal/agent/rpc/client.go index c7e452d..e03166c 100644 --- a/internal/agent/rpc/client.go +++ b/internal/agent/rpc/client.go @@ -2,30 +2,29 @@ package rpc import ( "context" - "fmt" pb "github.com/lorsanstand/HomeOps-Hub/api/gen/homeops" "github.com/lorsanstand/HomeOps-Hub/internal/agent/domain" + "github.com/rs/zerolog" "google.golang.org/grpc" ) type Connection struct { hub pb.HubClient conn *grpc.ClientConn + log zerolog.Logger } -func NewConnectAgent(address string) (*Connection, error) { - conn, err := grpc.NewClient(address) - if err != nil { - return nil, fmt.Errorf("failed connection hub: %v", err) - } +func NewConnectAgent(conn *grpc.ClientConn, logger zerolog.Logger) *Connection { + logger = logger.With().Str("component", "agent.rpc").Logger() client := pb.NewHubClient(conn) - return &Connection{hub: client, conn: conn}, nil + return &Connection{hub: client, conn: conn, log: logger} } func (c *Connection) Close() error { + c.log.Warn().Msg("connection 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) { ResponseData, err := c.Hub().RegisterAgent(ctx, new(toAgentRegisterRequest(RegisterData))) + c.log.Info().Msg("register agent") return toAgentRegisterDataResponse(ResponseData), err } diff --git a/internal/agent/service/collector/collector.go b/internal/agent/service/collector/collector.go new file mode 100644 index 0000000..66f94de --- /dev/null +++ b/internal/agent/service/collector/collector.go @@ -0,0 +1 @@ +package collector diff --git a/internal/agent/service/docker_service/docker.go b/internal/agent/service/docker_service/docker.go index c4052ff..d27e768 100644 --- a/internal/agent/service/docker_service/docker.go +++ b/internal/agent/service/docker_service/docker.go @@ -5,6 +5,7 @@ import ( "github.com/moby/moby/api/types" "github.com/moby/moby/api/types/container" + "github.com/rs/zerolog" ) type dockerAPI interface { @@ -14,18 +15,24 @@ type dockerAPI interface { type DockerService struct { dockerClient dockerAPI + log zerolog.Logger } -func NewDockerService(api dockerAPI) *DockerService { - return &DockerService{dockerClient: api} +func NewDockerService(api dockerAPI, logger zerolog.Logger) *DockerService { + return &DockerService{ + dockerClient: api, + log: logger.With().Str("component", "agent.serivce.docker").Logger(), + } } func (d *DockerService) CheckDockerDaemon(ctx context.Context) error { _, err := d.dockerClient.Ping(ctx) + d.log.Debug().Msg("check docker") return err } func (d *DockerService) ContainersList(ctx context.Context) ([]container.Summary, error) { ContainersList, err := d.dockerClient.ContainerList(ctx, container.ListOptions{}) + d.log.Debug().Msg("get container list") return ContainersList, err }