slaventius 2 years ago
parent 4db8d0b395
commit 270244b998
  1. 14
      cmd/main.go
  2. 8
      internal/transport/grpc/grpc.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)
//

@ -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

Loading…
Cancel
Save