diff --git a/api/proto/auth.proto b/api/proto/auth.proto deleted file mode 100644 index 4b245e9..0000000 --- a/api/proto/auth.proto +++ /dev/null @@ -1,46 +0,0 @@ -syntax="proto3"; -package auth; -option go_package = "./"; - -// go install google.golang.org/protobuf/cmd/protoc-gen-go@latest -// go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest -// go get google.golang.org/grpc - -// protoc -I=api/proto --go_out=pkg/api --go_opt=paths=source_relative --go-grpc_out=pkg/api --go-grpc_opt=paths=source_relative api/proto/auth.proto - -// Логин пользователя -message LoginRequest { - string Login = 1; - string Password = 2; -} - -message LoginResponse { - int32 ID = 1; -} - -// Регистрация пользователя -message RegistrationRequest { - string Login = 1; - string Email = 2; -} - -message RegistrationResponse { - string Code = 1; - string Email = 2; -} - -// Подтверждение пользователя -message ConfirmationRequest { - string Code = 1; -} - -message ConfirmationResponse { - int32 ID = 1; -} - -// ... -service AuthDB { - rpc Login(LoginRequest) returns (LoginResponse){} - rpc Registration(RegistrationRequest) returns(RegistrationResponse){} - rpc Confirmation(ConfirmationRequest) returns(ConfirmationResponse){} -} \ No newline at end of file diff --git a/internal/authDB.go b/internal/authDB.go index 251d347..f914472 100644 --- a/internal/authDB.go +++ b/internal/authDB.go @@ -10,9 +10,8 @@ import ( "sync" "time" - kafka "git.slaventius.ru/test3k/authDB/internal/transport/kafka" - "git.slaventius.ru/test3k/authDB/internal/config" + kafka "git.slaventius.ru/test3k/authDB/internal/transport/kafka" api "git.slaventius.ru/test3k/umate/pkg/api" apiKafka "git.slaventius.ru/test3k/umate/pkg/kafka" logger "git.slaventius.ru/test3k/umate/pkg/logger" @@ -33,6 +32,7 @@ type AuthDBServer struct { kafkaWriter *kafka.KafkaWriter logger *logger.Logger api.UnimplementedAuthDBServer + api.UnimplementedHealthServer ctx context.Context id int32 } @@ -155,3 +155,32 @@ func (s *AuthDBServer) Confirmation(ctx context.Context, req *api.ConfirmationRe return nil, errors.New("code unknown") } + +func (s *AuthDBServer) Check(ctx context.Context, req *api.HealthCheckRequest) (*api.HealthCheckResponse, error) { + s.logger.Println("🏥 K8s is health checking") + s.logger.Printf("✅ Server's status is %s", api.HealthCheckResponse_SERVING) + + // if isDatabaseReady == true { + // s.logger.Printf("✅ Server's status is %s", api.HealthCheckResponse_SERVING) + + // return &api.HealthCheckResponse{ + // Status: api.HealthCheckResponse_SERVING, + // }, nil + // } else if isDatabaseReady == false { + // s.logger.Printf("🚫 Server's status is %s", api.HealthCheckResponse_NOT_SERVING) + + // return &api.HealthCheckResponse{ + // Status: api.HealthCheckResponse_NOT_SERVING, + // }, nil + // } else { + // s.logger.Printf("🚫 Server's status is %s", api.HealthCheckResponse_UNKNOWN) + + // return &api.HealthCheckResponse{ + // Status: api.HealthCheckResponse_UNKNOWN, + // }, nil + // } + + return &api.HealthCheckResponse{ + Status: api.HealthCheckResponse_SERVING, + }, nil +}