slaventius 2 years ago
parent 61a3b369da
commit f21e869567
  1. 1
      .gitignore
  2. BIN
      authService
  3. 7
      cmd/main.go
  4. 4
      internal/transport/grpc/db.go
  5. 4
      internal/transport/rest/server.go

1
.gitignore vendored

@ -1 +1,2 @@
authService authService

Binary file not shown.

@ -2,11 +2,12 @@ package main
import ( import (
"context" "context"
"fmt"
"log" "log"
"net"
"net/http" "net/http"
"os" "os"
"os/signal" "os/signal"
"strconv"
"syscall" "syscall"
"test3k/auth/internal/config" "test3k/auth/internal/config"
server "test3k/auth/internal/transport/rest" server "test3k/auth/internal/transport/rest"
@ -39,7 +40,7 @@ func main() {
// Остановка сервера // Остановка сервера
func stop(signalChannel chan os.Signal, s *server.AuthServer) { func stop(signalChannel chan os.Signal, s *server.AuthServer) {
defer s.Close() defer s.GracefulStop()
defer signal.Stop(signalChannel) defer signal.Stop(signalChannel)
log.Println("authServer stopping ...") 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) { 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) log.Printf("authServer starting (%s)\n", connStr)

@ -32,8 +32,8 @@ func NewDBClient(ctx context.Context, config *config.Config) *AuthDBClient {
} }
} }
func (s *AuthDBClient) Close() { func (s *AuthDBClient) Close() error {
s.client.Close() return s.client.Close()
} }
func (s *AuthDBClient) Login(uid string, password string) error { func (s *AuthDBClient) Login(uid string, password string) error {

@ -35,8 +35,8 @@ func NewServer(ctx context.Context, config *config.Config) *AuthServer {
return s return s
} }
func (s *AuthServer) Close() { func (s *AuthServer) GracefulStop() error {
s.db.Close() return s.db.Close()
} }
func login(s *AuthServer) http.HandlerFunc { func login(s *AuthServer) http.HandlerFunc {

Loading…
Cancel
Save