stevenhowes/dorset-binformation
1
0
Fork 0
mirror of https://github.com/stevenhowes/dorset-binformation.git synced 2026-05-26 15:53:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak error handling

Browse Source
This commit is contained in:
Steve Howes
2024-04-10 22:10:20 +01:00
parent 50254e973b
commit 22b15cada4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dorset-binformation.go
+9 -3
View File
@@ -5,7 +5,7 @@ import (
"errors" "errors"
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io"
"log" "log"
"net/http" "net/http"
"os" "os"
@@ -22,7 +22,7 @@ func getHTML(url string) (*html.Node, error) {
} }
defer resp.Body.Close() defer resp.Body.Close()
b, err := ioutil.ReadAll(resp.Body) b, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -96,6 +96,7 @@ func handleRequest(w http.ResponseWriter, r *http.Request, logger *log.Logger) {
// If we got an error from the council (in text) pass it on // If we got an error from the council (in text) pass it on
err = findDates(doc, dates) err = findDates(doc, dates)
if err != nil { if err != nil {
logger.Println("Error retrieving data: ", err) logger.Println("Error retrieving data: ", err)
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
@@ -105,11 +106,16 @@ func handleRequest(w http.ResponseWriter, r *http.Request, logger *log.Logger) {
jsonData, err := json.Marshal(dates) jsonData, err := json.Marshal(dates)
if err != nil { if err != nil {
logger.Println(err) logger.Println(err)
w.WriteHeader(http.StatusInternalServerError)
return
} }
// return jsonData to the client // return jsonData to the client
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
w.Write(jsonData) _, err = w.Write(jsonData)
if err != nil {
logger.Println("Error writing response: ", err)
}
} }
func main() { func main() {