Remove fmt.Println and add Zerolog logging system
Some checks failed
Build and Push Docker Image / build_and_push (push) Failing after 1m2s

This commit is contained in:
2024-11-11 20:35:17 +01:00
parent 4ae6aa7a90
commit 5e4cea0bb3
11 changed files with 88 additions and 55 deletions

View File

@@ -2,9 +2,9 @@ package grpcapi
import (
"encoding/json"
"fmt"
"git.coopgo.io/coopgo-platform/mobility-accounts/storage"
"github.com/rs/zerolog/log"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/structpb"
)
@@ -27,7 +27,7 @@ func (a Account) ToStorageType() storage.Account {
for k, d := range a.Data.GetFields() {
jsondata, err := protojson.Marshal(d)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
break
}
var data any
@@ -68,7 +68,7 @@ func AccountFromStorageType(account *storage.Account) (*Account, error) {
data, err := structpb.NewStruct(d)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, err
}

View File

@@ -2,11 +2,10 @@ package grpcapi
import (
context "context"
"fmt"
"log"
"net"
"git.coopgo.io/coopgo-platform/mobility-accounts/handlers"
"github.com/rs/zerolog/log"
"github.com/spf13/viper"
"google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@@ -31,7 +30,7 @@ func (s MobilityAccountsServerImpl) Login(ctx context.Context, req *LoginRequest
}
response, err := AccountFromStorageType(account)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, status.Errorf(codes.Internal, "issue while retrieving account : %v", err)
}
return &LoginResponse{Account: response}, nil
@@ -40,12 +39,12 @@ func (s MobilityAccountsServerImpl) Register(ctx context.Context, req *RegisterR
a := req.Account.ToStorageType()
account, err := s.handler.Register(a)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, status.Errorf(codes.AlreadyExists, "account creation failed : %v", err)
}
response, err := AccountFromStorageType(account)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, status.Errorf(codes.Internal, "issue while retrieving account : %v", err)
}
return &RegisterResponse{Account: response}, nil
@@ -58,7 +57,7 @@ func (s MobilityAccountsServerImpl) UpdateData(ctx context.Context, req *UpdateD
}
response, err := AccountFromStorageType(account)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, status.Errorf(codes.Internal, "issue while retrieving account : %v", err)
}
return &UpdateDataResponse{Account: response}, nil
@@ -78,12 +77,12 @@ func (s MobilityAccountsServerImpl) UpdatePhoneNumber(ctx context.Context, req *
func (s MobilityAccountsServerImpl) GetAccount(ctx context.Context, req *GetAccountRequest) (*GetAccountResponse, error) {
account, err := s.handler.GetAccount(req.Id)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, status.Errorf(codes.AlreadyExists, "issue while retrieving account : %v", err)
}
response, err := AccountFromStorageType(account)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, status.Errorf(codes.Internal, "issue while retrieving account : %v", err)
}
return &GetAccountResponse{Account: response}, nil
@@ -91,12 +90,12 @@ func (s MobilityAccountsServerImpl) GetAccount(ctx context.Context, req *GetAcco
func (s MobilityAccountsServerImpl) GetAccountUsername(ctx context.Context, req *GetAccountUsernameRequest) (*GetAccountUsernameResponse, error) {
account, err := s.handler.GetAccountUsername(req.Username, req.Namespace)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, status.Errorf(codes.AlreadyExists, "issue while retrieving account : %v", err)
}
response, err := AccountFromStorageType(account)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, status.Errorf(codes.Internal, "issue while retrieving account : %v", err)
}
return &GetAccountUsernameResponse{Account: response}, nil
@@ -147,13 +146,13 @@ func Run(done chan error, cfg *viper.Viper, handler handlers.MobilityAccountsHan
dev_env = cfg.GetBool("dev_env")
address = ":" + cfg.GetString("services.grpc.port")
)
fmt.Println("-> GRPC server on", address)
log.Info().Str("address", address).Msg("Running gRPC server")
server := grpc.NewServer()
RegisterMobilityAccountsServer(server, NewMobilityAccountsServer(handler))
l, err := net.Listen("tcp", address)
if err != nil {
log.Fatal(err)
log.Fatal().Str("address", address).Err(err).Msg("gRPC server cannot listen")
}
if dev_env {
@@ -161,7 +160,7 @@ func Run(done chan error, cfg *viper.Viper, handler handlers.MobilityAccountsHan
}
if err := server.Serve(l); err != nil {
fmt.Println("gRPC service ended")
log.Error().Err(err).Msg("gRPC service ended")
done <- err
}
}