diff --git a/.gitignore b/.gitignore index f5b50b8..00d64cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ authService + diff --git a/authService b/authService index 2219bf7..46a0872 100755 Binary files a/authService and b/authService differ diff --git a/cmd/main.go b/cmd/main.go index 87d4f14..7c57c38 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -2,11 +2,12 @@ package main import ( "context" - "fmt" "log" + "net" "net/http" "os" "os/signal" + "strconv" "syscall" "test3k/auth/internal/config" server "test3k/auth/internal/transport/rest" @@ -39,7 +40,7 @@ func main() { // Остановка сервера func stop(signalChannel chan os.Signal, s *server.AuthServer) { - defer s.Close() + defer s.GracefulStop() defer signal.Stop(signalChannel) log.Println("authServer stopping ...") @@ -47,7 +48,7 @@ func stop(signalChannel chan os.Signal, s *server.AuthServer) { // Запуск сервера func start(ctx context.Context, config *config.Config, s *server.AuthServer) { - connStr := fmt.Sprintf(":%d", config.App.Port) + connStr := net.JoinHostPort("", strconv.Itoa(config.App.Port)) // log.Printf("authServer starting (%s)\n", connStr) diff --git a/internal/transport/grpc/db.go b/internal/transport/grpc/db.go index d697b00..cfe6b2e 100644 --- a/internal/transport/grpc/db.go +++ b/internal/transport/grpc/db.go @@ -32,8 +32,8 @@ func NewDBClient(ctx context.Context, config *config.Config) *AuthDBClient { } } -func (s *AuthDBClient) Close() { - s.client.Close() +func (s *AuthDBClient) Close() error { + return s.client.Close() } func (s *AuthDBClient) Login(uid string, password string) error { diff --git a/internal/transport/rest/server.go b/internal/transport/rest/server.go index 704528e..e7f50d7 100644 --- a/internal/transport/rest/server.go +++ b/internal/transport/rest/server.go @@ -35,8 +35,8 @@ func NewServer(ctx context.Context, config *config.Config) *AuthServer { return s } -func (s *AuthServer) Close() { - s.db.Close() +func (s *AuthServer) GracefulStop() error { + return s.db.Close() } func login(s *AuthServer) http.HandlerFunc {