From 02f6bb6813789dc987189eee13a47e53dad03977 Mon Sep 17 00:00:00 2001 From: lorsan Date: Sat, 4 Apr 2026 20:35:41 +0300 Subject: [PATCH] refactor: init log --- cmd/hub/main.go | 21 --------------------- internal/hub/app/app.go | 11 +++++++++++ internal/hub/grpc/server.go | 2 -- internal/shared/{cfg => config}/config.go | 2 +- internal/shared/log/init.go | 16 +++++++++------- 5 files changed, 21 insertions(+), 31 deletions(-) create mode 100644 internal/hub/app/app.go rename internal/shared/{cfg => config}/config.go (98%) diff --git a/cmd/hub/main.go b/cmd/hub/main.go index b26c383..da29a2c 100644 --- a/cmd/hub/main.go +++ b/cmd/hub/main.go @@ -1,25 +1,4 @@ package main -import ( - "log" - "net" - - "github.com/lorsanstand/HomeOps-Hub/api/gen/homeops" - grpcserver "github.com/lorsanstand/HomeOps-Hub/internal/hub/grpc" - "google.golang.org/grpc" -) - func main() { - lis, err := net.Listen("tcp", ":6756") - if err != nil { - return - } - - grpcServer := grpc.NewServer() - - srv := &grpcserver.Server{} - homeops.RegisterHubServer(grpcServer, srv) - - log.Println("Start serve") - grpcServer.Serve(lis) } diff --git a/internal/hub/app/app.go b/internal/hub/app/app.go new file mode 100644 index 0000000..48bacef --- /dev/null +++ b/internal/hub/app/app.go @@ -0,0 +1,11 @@ +package app + +import ( + "github.com/lorsanstand/HomeOps-Hub/internal/shared/config" + "github.com/rs/zerolog" +) + +type App struct { + cfg *config.Config + log *zerolog.Logger +} diff --git a/internal/hub/grpc/server.go b/internal/hub/grpc/server.go index 60b2bf3..0083b07 100644 --- a/internal/hub/grpc/server.go +++ b/internal/hub/grpc/server.go @@ -2,7 +2,6 @@ package grpc import ( "context" - "log" "github.com/lorsanstand/HomeOps-Hub/api/gen/homeops" "google.golang.org/protobuf/types/known/emptypb" @@ -13,7 +12,6 @@ type Server struct { } func (s *Server) Ping(ctx context.Context, _ *emptypb.Empty) (*homeops.PongResponse, error) { - log.Println("Answer") return &homeops.PongResponse{Pong: "Huiiii"}, nil } diff --git a/internal/shared/cfg/config.go b/internal/shared/config/config.go similarity index 98% rename from internal/shared/cfg/config.go rename to internal/shared/config/config.go index dfd9754..1981df0 100644 --- a/internal/shared/cfg/config.go +++ b/internal/shared/config/config.go @@ -1,4 +1,4 @@ -package cfg +package config import ( "fmt" diff --git a/internal/shared/log/init.go b/internal/shared/log/init.go index f44fc6b..8e4661a 100644 --- a/internal/shared/log/init.go +++ b/internal/shared/log/init.go @@ -1,11 +1,11 @@ package log import ( + "io" "os" "time" "github.com/rs/zerolog" - "github.com/rs/zerolog/log" ) type cfgLogStore interface { @@ -13,15 +13,17 @@ type cfgLogStore interface { GetMode() string } -func Init(cfg cfgLogStore) { - zerolog.TimeFieldFormat = zerolog.TimeFormatUnix +func NewLogger(cfg cfgLogStore) zerolog.Logger { + var output io.Writer = os.Stdout if cfg.GetMode() != "PROD" { - log.Logger = log.Output(zerolog.ConsoleWriter{ + output = zerolog.ConsoleWriter{ Out: os.Stdout, TimeFormat: time.Kitchen, - }) - } else { - zerolog.SetGlobalLevel(zerolog.InfoLevel) + } } + + level := cfg.GetLogLevel() + + return zerolog.New(output).Level(level).With().Timestamp().Logger() }