xevion/scla-unsubscribe
1
0
Fork 0
mirror of https://github.com/Xevion/scla-unsubscribe.git synced 2025-12-08 20:08:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve request helpers, add duration, add attributes to error cases

Browse Source
This commit is contained in:
Xevion
2023-12-28 13:52:13 -06:00
parent 5fc7393f4c
commit 1a7b479679
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
helpers.go
View File

@@ -3,6 +3,7 @@ package main
import ( import (
"io" "io"
"net/http" "net/http"
"time"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
@@ -12,14 +13,18 @@ import (
// This function encapsulates the boilerplate for logging // This function encapsulates the boilerplate for logging
func DoRequestNoRead(req *http.Request) (*http.Response, error) { func DoRequestNoRead(req *http.Request) (*http.Response, error) {
log.Debug().Str("method", req.Method).Str("host", req.Host).Str("path", req.URL.Path).Msg("Request") log.Debug().Str("method", req.Method).Str("host", req.Host).Str("path", req.URL.Path).Msg("Request")
start := time.Now()
resp, err := client.Do(req) resp, err := client.Do(req)
duration := time.Since(start)
if err != nil { if err != nil {
log.Error().Err(err).Msg("Error making request") log.Error().Err(err).Msg("Request Error")
return nil, err return nil, err
} }
log.Debug().Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Str("content-length", resp.Header.Get("Content-Length")).Msg("Response") log.Debug().Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Str("content-length", resp.Header.Get("Content-Length")).
Str("duration", duration.String()).Msg("Response")
return resp, nil return resp, nil
} }
@@ -27,23 +32,32 @@ func DoRequestNoRead(req *http.Request) (*http.Response, error) {
// DoRequest makes a request and returns the response and body // DoRequest makes a request and returns the response and body
// This function encapsulates the boilerplate for logging and reading the response body // This function encapsulates the boilerplate for logging and reading the response body
func DoRequest(req *http.Request) (*http.Response, []byte, error) { func DoRequest(req *http.Request) (*http.Response, []byte, error) {
// Log the request
log.Debug().Str("method", req.Method).Str("host", req.Host).Str("path", req.URL.Path).Msg("Request") log.Debug().Str("method", req.Method).Str("host", req.Host).Str("path", req.URL.Path).Msg("Request")
resp, err := client.Do(req)
// Send the request (while acquiring timings)
start := time.Now()
resp, err := client.Do(req)
duration := time.Since(start)
// Handle errors
if err != nil { if err != nil {
log.Error().Err(err).Msg("Error making request") log.Error().Err(err).Msg("Request Error")
return nil, nil, err return nil, nil, err
} }
// Read the body
defer resp.Body.Close() defer resp.Body.Close()
body, err := io.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
log.Error().Err(err).Msg("Error reading response body") log.Err(err).Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Int("content-length", len(body)).
Str("duration", duration.String()).Msg("Response (Unable to Read Body)")
return nil, nil, err return nil, nil, err
} }
log.Debug().Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Int("content-length", len(body)).Msg("Response") log.Debug().Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Int("content-length", len(body)).
Str("duration", duration.String()).Msg("Response")
return resp, body, nil return resp, body, nil
} }