diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f5b50b8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +authService diff --git a/authService b/authService index b44bf3e..2219bf7 100755 Binary files a/authService and b/authService differ diff --git a/cmd/main.go b/cmd/main.go index 9bd8c9a..87d4f14 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -30,57 +30,19 @@ func main() { for { select { case <-signalChannel: - fmt.Println("authServer stopping ...") - return case <-ctx.Done(): - fmt.Println("authServer stopping ...") - return } } - - // connStr := fmt.Sprintf("%s:%d", config.Db.Host, config.Db.Port) - // conn, erc := grpc.Dial(connStr, grpc.WithInsecure()) - // if erc != nil { - // log.Fatal(erc) - // } - // defer conn.Close() - - // // - // ctx := context.Background() - // cli := api.NewAuthDBClient(conn) - // fmt.Printf("Connect to DB on %v\n", connStr) - - // // - // _, era := cli.Login(ctx, &api.LoginRequest{Login: "vasya", Password: "123"}) - // if era != nil { - // status := status.Convert(era) - // if status.Message() == "login unknown" { - // reg, err := cli.Registration(ctx, &api.RegistrationRequest{ - // Login: "vasya", - // Email: "vasya@mail.ru", - // }) - // if err != nil { - // log.Fatal(err) - // } - - // fmt.Println(reg) - // } else if status.Message() == "login unconfirmed" { - // code := "283164522" - // _, erc := cli.Confirmation(ctx, &api.ConfirmationRequest{Code: code}) - // if erc != nil { - // log.Fatal(erc) - // } - // } - // } } // Остановка сервера func stop(signalChannel chan os.Signal, s *server.AuthServer) { defer s.Close() + defer signal.Stop(signalChannel) - signal.Stop(signalChannel) + log.Println("authServer stopping ...") } // Запуск сервера @@ -88,7 +50,7 @@ func start(ctx context.Context, config *config.Config, s *server.AuthServer) { connStr := fmt.Sprintf(":%d", config.App.Port) // - log.Printf("authServer up (%s)\n", connStr) + log.Printf("authServer starting (%s)\n", connStr) // err := http.ListenAndServe(connStr, s.Router) // router