From 270244b998f0eeea886641b45b0f1a0164dec216 Mon Sep 17 00:00:00 2001 From: slaventius Date: Thu, 2 Feb 2023 13:05:45 +0300 Subject: [PATCH] * --- cmd/main.go | 14 +++++++++----- internal/transport/grpc/grpc.go | 8 ++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 3298837..7e45352 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -17,7 +17,7 @@ import ( func main() { config := config.NewConfig() - ctx, _ := context.WithCancel(context.Background()) + ctx, ctxCancel := context.WithCancel(context.Background()) srv := server.NewServer(config) s := grpc.NewServer() @@ -25,10 +25,10 @@ func main() { signalChannel := make(chan os.Signal, 1) signal.Notify(signalChannel, syscall.SIGINT) signal.Notify(signalChannel, syscall.SIGTERM) - defer stop(signalChannel, s, srv) + defer stop(signalChannel, s, srv, ctxCancel) // Запуск сервера - go start(config, s, srv) + go start(config, s, srv, ctxCancel) // for { @@ -42,16 +42,20 @@ func main() { } // Остановка сервера -func stop(signalChannel chan os.Signal, s *grpc.Server, srv *server.AuthDBServer) { +func stop(signalChannel chan os.Signal, s *grpc.Server, srv *server.AuthDBServer, cancel context.CancelFunc) { defer s.GracefulStop() defer srv.GracefulStop() defer signal.Stop(signalChannel) + defer cancel() log.Println("authDBServer stopping ...") } // Запуск сервера -func start(config *config.Config, s *grpc.Server, srv *server.AuthDBServer) { +func start(config *config.Config, s *grpc.Server, srv *server.AuthDBServer, cancel context.CancelFunc) { + defer cancel() + + // api.RegisterAuthDBServer(s, srv) // diff --git a/internal/transport/grpc/grpc.go b/internal/transport/grpc/grpc.go index a2b4bcb..8cbf9b2 100644 --- a/internal/transport/grpc/grpc.go +++ b/internal/transport/grpc/grpc.go @@ -76,10 +76,10 @@ func (s *AuthDBServer) Registration(ctx context.Context, req *api.RegistrationRe s.mu.Lock() defer s.mu.Unlock() - // - if _, ok := s.users[req.GetLogin()]; ok { - return nil, errors.New("login already registered") - } + // // + // if _, ok := s.users[req.GetLogin()]; ok { + // return nil, errors.New("login already registered") + // } // s.id = s.id + 1