Log errors encountered in HTTP handlers. (#42)

ServiceWeaver · Sep 27, 2023 · 4eca79e · 4eca79e
1 parent f4c30e5
commit 4eca79e
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 14 deletions.
diff --git a/04/main.go b/04/main.go
@@ -49,24 +49,30 @@ func run(ctx context.Context, a *app) error {
 			http.NotFound(w, r)
 			return
 		}
-		fmt.Fprint(w, indexHtml)
+		if _, err := fmt.Fprint(w, indexHtml); err != nil {
+			a.Logger(r.Context()).Error("error writing index.html", "err", err)
+		}
 	})
 	http.HandleFunc("/search", func(w http.ResponseWriter, r *http.Request) {
 		// Search for the list of matching emojis.
 		query := r.URL.Query().Get("q")
 		emojis, err := a.searcher.Get().Search(r.Context(), query)
 		if err != nil {
+			a.Logger(r.Context()).Error("error getting search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
 		// JSON serialize the results.
 		bytes, err := json.Marshal(emojis)
 		if err != nil {
+			a.Logger(r.Context()).Error("error marshaling search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		fmt.Fprintln(w, string(bytes))
+		if _, err := fmt.Fprintln(w, string(bytes)); err != nil {
+			a.Logger(r.Context()).Error("error writing search results", "err", err)
+		}
 	})
 	return http.Serve(a.lis, nil)
 }
diff --git a/05/main.go b/05/main.go
@@ -49,24 +49,30 @@ func run(ctx context.Context, a *app) error {
 			http.NotFound(w, r)
 			return
 		}
-		fmt.Fprint(w, indexHtml)
+		if _, err := fmt.Fprint(w, indexHtml); err != nil {
+			a.Logger(r.Context()).Error("error writing index.html", "err", err)
+		}
 	})
 	http.HandleFunc("/search", func(w http.ResponseWriter, r *http.Request) {
 		// Search for the list of matching emojis.
 		query := r.URL.Query().Get("q")
 		emojis, err := a.searcher.Get().Search(r.Context(), query)
 		if err != nil {
+			a.Logger(r.Context()).Error("error getting search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
 		// JSON serialize the results.
 		bytes, err := json.Marshal(emojis)
 		if err != nil {
+			a.Logger(r.Context()).Error("error marshaling search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		fmt.Fprintln(w, string(bytes))
+		if _, err := fmt.Fprintln(w, string(bytes)); err != nil {
+			a.Logger(r.Context()).Error("error writing search results", "err", err)
+		}
 	})
 	return http.Serve(a.lis, nil)
 }
diff --git a/06/main.go b/06/main.go
@@ -49,24 +49,30 @@ func run(ctx context.Context, a *app) error {
 			http.NotFound(w, r)
 			return
 		}
-		fmt.Fprint(w, indexHtml)
+		if _, err := fmt.Fprint(w, indexHtml); err != nil {
+			a.Logger(r.Context()).Error("error writing index.html", "err", err)
+		}
 	})
 	http.HandleFunc("/search", func(w http.ResponseWriter, r *http.Request) {
 		// Search for the list of matching emojis.
 		query := r.URL.Query().Get("q")
 		emojis, err := a.searcher.Get().Search(r.Context(), query)
 		if err != nil {
+			a.Logger(r.Context()).Error("error getting search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
 		// JSON serialize the results.
 		bytes, err := json.Marshal(emojis)
 		if err != nil {
+			a.Logger(r.Context()).Error("error marshaling search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		fmt.Fprintln(w, string(bytes))
+		if _, err := fmt.Fprintln(w, string(bytes)); err != nil {
+			a.Logger(r.Context()).Error("error writing search results", "err", err)
+		}
 	})
 	return http.Serve(a.lis, nil)
 }
diff --git a/07/main.go b/07/main.go
@@ -49,24 +49,30 @@ func run(ctx context.Context, a *app) error {
 			http.NotFound(w, r)
 			return
 		}
-		fmt.Fprint(w, indexHtml)
+		if _, err := fmt.Fprint(w, indexHtml); err != nil {
+			a.Logger(r.Context()).Error("error writing index.html", "err", err)
+		}
 	})
 	http.HandleFunc("/search", func(w http.ResponseWriter, r *http.Request) {
 		// Search for the list of matching emojis.
 		query := r.URL.Query().Get("q")
 		emojis, err := a.searcher.Get().Search(r.Context(), query)
 		if err != nil {
+			a.Logger(r.Context()).Error("error getting search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
 		// JSON serialize the results.
 		bytes, err := json.Marshal(emojis)
 		if err != nil {
+			a.Logger(r.Context()).Error("error marshaling search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		fmt.Fprintln(w, string(bytes))
+		if _, err := fmt.Fprintln(w, string(bytes)); err != nil {
+			a.Logger(r.Context()).Error("error writing search results", "err", err)
+		}
 	})
 	return http.Serve(a.lis, nil)
 }
diff --git a/08/main.go b/08/main.go
@@ -49,24 +49,30 @@ func run(ctx context.Context, a *app) error {
 			http.NotFound(w, r)
 			return
 		}
-		fmt.Fprint(w, indexHtml)
+		if _, err := fmt.Fprint(w, indexHtml); err != nil {
+			a.Logger(r.Context()).Error("error writing index.html", "err", err)
+		}
 	})
 	http.HandleFunc("/search", func(w http.ResponseWriter, r *http.Request) {
 		// Search for the list of matching emojis.
 		query := r.URL.Query().Get("q")
 		emojis, err := a.searcher.Get().Search(r.Context(), query)
 		if err != nil {
+			a.Logger(r.Context()).Error("error getting search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
 		// JSON serialize the results.
 		bytes, err := json.Marshal(emojis)
 		if err != nil {
+			a.Logger(r.Context()).Error("error marshaling search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		fmt.Fprintln(w, string(bytes))
+		if _, err := fmt.Fprintln(w, string(bytes)); err != nil {
+			a.Logger(r.Context()).Error("error writing search results", "err", err)
+		}
 	})
 	return http.Serve(a.lis, nil)
 }
diff --git a/09/main.go b/09/main.go
@@ -49,24 +49,30 @@ func run(ctx context.Context, a *app) error {
 			http.NotFound(w, r)
 			return
 		}
-		fmt.Fprint(w, indexHtml)
+		if _, err := fmt.Fprint(w, indexHtml); err != nil {
+			a.Logger(r.Context()).Error("error writing index.html", "err", err)
+		}
 	})
 	http.HandleFunc("/search", func(w http.ResponseWriter, r *http.Request) {
 		// Search for the list of matching emojis.
 		query := r.URL.Query().Get("q")
 		emojis, err := a.searcher.Get().Search(r.Context(), query)
 		if err != nil {
+			a.Logger(r.Context()).Error("error getting search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
 		// JSON serialize the results.
 		bytes, err := json.Marshal(emojis)
 		if err != nil {
+			a.Logger(r.Context()).Error("error marshaling search results", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		fmt.Fprintln(w, string(bytes))
+		if _, err := fmt.Fprintln(w, string(bytes)); err != nil {
+			a.Logger(r.Context()).Error("error writing search results", "err", err)
+		}
 	})
 	return http.Serve(a.lis, nil)
 }
diff --git a/10/main.go b/10/main.go
@@ -49,7 +49,9 @@ func run(ctx context.Context, a *app) error {
 			http.NotFound(w, r)
 			return
 		}
-		fmt.Fprint(w, indexHtml)
+		if _, err := fmt.Fprint(w, indexHtml); err != nil {
+			a.Logger(ctx).Error("error writing index.html", "err", err)
+		}
 	})
 	http.HandleFunc("/search", func(w http.ResponseWriter, r *http.Request) {
 		a.handleSearch(a.searcher.Get().Search, w, r)
@@ -67,15 +69,19 @@ func (a *app) handleSearch(search func(context.Context, string) ([]string, error
 	query := r.URL.Query().Get("q")
 	emojis, err := search(r.Context(), query)
 	if err != nil {
+		a.Logger(r.Context()).Error("error getting search results", "err", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
 	// JSON serialize the results.
 	bytes, err := json.Marshal(emojis)
 	if err != nil {
+		a.Logger(r.Context()).Error("error marshaling search results", "err", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	fmt.Fprintln(w, string(bytes))
+	if _, err := fmt.Fprintln(w, string(bytes)); err != nil {
+		a.Logger(r.Context()).Error("error writing search results", "err", err)
+	}
 }