From 95756cbeeec54795342eee1973147d88c6e2336c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 4 Feb 2026 10:51:06 +0300 Subject: [PATCH] disable https --- cmd/gateway/main.go | 2 +- configs/config.yml | 2 +- internal/server/server.go | 13 ++++--------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/cmd/gateway/main.go b/cmd/gateway/main.go index 2a5fd39..cef2a17 100644 --- a/cmd/gateway/main.go +++ b/cmd/gateway/main.go @@ -53,7 +53,7 @@ func main() { // Запускаем сервер в отдельной горутине done := make(chan struct{}) - errChan := srv.Start(&cfg.TLS) + errChan := srv.Start() // Настраиваем перехват системных сигналов для graceful shutdown sigChan := make(chan os.Signal, 1) diff --git a/configs/config.yml b/configs/config.yml index 8e95eef..91d7632 100644 --- a/configs/config.yml +++ b/configs/config.yml @@ -1,6 +1,6 @@ server: host: ${GATEWAY_SERVER_HOST:0.0.0.0} - port: ${GATEWAY_SERVER_PORT:443} # 5150 + port: ${GATEWAY_SERVER_PORT:5150} gateway: debug: false diff --git a/internal/server/server.go b/internal/server/server.go index 31bc838..fef0f54 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -8,8 +8,6 @@ import ( "net/http" "time" - "golang.org/x/net/http2" - "yobble-gateway-go/internal/config" "yobble-gateway-go/internal/logger" "yobble-gateway-go/internal/middleware" @@ -50,25 +48,22 @@ func NewServer(cfg *config.Settings, geoIPService *geoip.GeoIPService) *Server { // TODO: Add ReadHeaderTimeout, ReadTimeout, WriteTimeout, IdleTimeout from config } - // Explicitly enable HTTP/2 - http2.ConfigureServer(httpServer, nil) - return &Server{ httpServer: httpServer, log: log, } } -// Start запускает HTTP/HTTPS сервер в отдельной горутине. +// Start запускает HTTP сервер в отдельной горутине. // Он возвращает канал, который будет закрыт, когда сервер завершит работу. -func (s *Server) Start(cfg *config.TLSConfig) <-chan error { +func (s *Server) Start() <-chan error { errChan := make(chan error, 1) - s.log.Info("server starting with TLS and HTTP/2", slog.String("address", s.httpServer.Addr)) + s.log.Info("server starting with HTTP", slog.String("address", s.httpServer.Addr)) go func() { defer close(errChan) - if err := s.httpServer.ListenAndServeTLS(cfg.ServerCert, cfg.ServerKey); err != nil && !errors.Is(err, http.ErrServerClosed) { + if err := s.httpServer.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) { s.log.Error("server failed to listen and serve", slog.Any("error", err)) errChan <- err }