✨ feat: Add Request timeout & Improve Logging

Author: nmdra

api/handlers.go

@@ -31,13 +31,23 @@ func (h *BookHandler) AddBook(c echo.Context) error {
 }
 
 func (h *BookHandler) SearchBooks(c echo.Context) error {
+	ctx := c.Request().Context()
 	query := c.QueryParam("q")
 	if query == "" {
 		return c.JSON(http.StatusBadRequest, echo.Map{"error": "missing query"})
 	}
 
-	results, err := h.Service.SearchBooks(c.Request().Context(), query)
+	select {
+	case <-ctx.Done():
+		return c.JSON(http.StatusRequestTimeout, echo.Map{"error": "request canceled or timed out"})
+	default:
+	}
+
+	results, err := h.Service.SearchBooks(ctx, query)
 	if err != nil {
+		if ctx.Err() != nil {
+			return c.JSON(http.StatusRequestTimeout, echo.Map{"error": "request timed out"})
+		}
 		return c.JSON(http.StatusInternalServerError, echo.Map{"error": err.Error()})
 	}
 

cmd/main.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log/slog"
 	"os"
+	"time"
 
 	"semantic-search/api"
 	"semantic-search/internal/db"
@@ -85,6 +86,13 @@ func main() {
 	e := echo.New()
 	e.Use(middleware.Logger())
 	e.Use(middleware.Recover())
+	e.Use(middleware.TimeoutWithConfig(middleware.TimeoutConfig{
+		Timeout: 5 * time.Second,
+		ErrorMessage: "Request timed out.",
+		OnTimeoutRouteErrorHandler: func(err error, c echo.Context) {
+			logger.Warn("Timeout on route", "path", c.Path(), "error", err)
+		},
+	}))
 
 	// Routes
 	e.GET("/ping", func(c echo.Context) error {

internal/db/db.go

@@ -34,7 +34,6 @@ func NewPool(ctx context.Context, dsn string, logger *slog.Logger) (*pgxpool.Poo
 
 	logger.Info("Pinging database to verify connection")
 	if err := pool.Ping(ctx); err != nil {
-		logger.Error("Failed to ping database", "error", err)
 		pool.Close()
 		return nil, fmt.Errorf("failed to ping database: %w", err)
 	}

internal/service/book_service.go

@@ -2,13 +2,11 @@ package service
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"log/slog"
 	"math"
 	"semantic-search/internal/embed"
 	"semantic-search/internal/repository"
-	"time"
 
 	"github.com/pgvector/pgvector-go"
 )
@@ -48,28 +46,34 @@ func (s *BookService) AddBook(ctx context.Context, title, desc string) error {
 
 // SearchBooks embeds the query, performs vector search, and ranks by cosine similarity.
 func (s *BookService) SearchBooks(ctx context.Context, query string) ([]BookWithSimilarity, error) {
+	select {
+	case <-ctx.Done():
+		return nil, ctx.Err()
+	default:
+	}
+
 	vector, err := s.Embedder.Embed(ctx, query)
 	if err != nil {
 		s.Logger.Error("Embedding failed", "query", query, "error", err)
 		return nil, fmt.Errorf("embedding failed: %w", err)
 	}
 
-	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-	defer cancel()
-
 	books, err := s.Repository.SearchBooks(ctx, pgvector.NewVector(vector))
 	if err != nil {
-		if errors.Is(err, context.DeadlineExceeded) {
-			s.Logger.Error("DB search timed out", "query", query)
-		} else {
-			s.Logger.Error("DB search failed", "query", query, "error", err)
-		}
+		s.Logger.Error("DB search failed", "query", query, "error", err)
 		return nil, fmt.Errorf("db search failed: %w", err)
 	}
 
-	// Calculate cosine similarity
+	// Step 3: Post-process (cosine similarity) — respect ctx
 	var results []BookWithSimilarity
 	for _, book := range books {
+		// Stop if request has been canceled
+		select {
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		default:
+		}
+
 		sim, err := cosineSimilarity(vector, book.Embedding.Slice())
 		if err != nil {
 			s.Logger.Warn("Failed to compute similarity", "bookID", book.ID, "error", err)