Skip to content

Commit

Permalink
Consolidate error handling in handlers
Browse files Browse the repository at this point in the history
  • Loading branch information
@maeb
maeb committed Dec 1, 2022
1 parent b58a4ba commit 6de6858
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 51 deletions.
64 changes: 29 additions & 35 deletions server/coreserver/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@ func (h Handler) search(w http.ResponseWriter, r *http.Request) {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}

response := make(chan index.CdxResponse)
ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
defer cancel()

log.Debug().Msgf("%+v", coreAPI)
if coreAPI.Limit == 0 {
coreAPI.Limit = 100
}
if err = h.CdxAPI.Search(ctx, api.SearchAPI{CoreAPI: coreAPI}, response); err != nil {
log.Error().Err(err).Msg("failed to search")
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msgf("Search failed: %+v", coreAPI)
return
}

Expand All @@ -85,11 +85,10 @@ func (h Handler) search(w http.ResponseWriter, r *http.Request) {
}
_, err = io.Copy(w, bytes.NewReader(v))
if err != nil {
log.Warn().Err(err).Int("status", http.StatusInternalServerError).Msg("failed to write result")
log.Warn().Err(err).Msg("failed to write result")
return
} else {
count++
}
count++
}
}

Expand All @@ -101,12 +100,14 @@ type storageRef struct {

func (h Handler) listIds(w http.ResponseWriter, r *http.Request) {
limit := parseLimit(r)

response := make(chan index.IdResponse)
ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
defer cancel()

if err := h.IdAPI.ListStorageRef(ctx, limit, response); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed to list ids")
return
}
start := time.Now()
Expand All @@ -132,18 +133,15 @@ func (h Handler) listIds(w http.ResponseWriter, r *http.Request) {
}
v, err := json.Marshal(ref)
if err != nil {
log.Warn().Err(err).Msg("failed to marshal storage ref")
log.Warn().Err(err).Msgf("failed to marshal storage ref: %+v", ref)
continue
}
if count > 0 {
_, _ = w.Write([]byte("\r\n"))
}
_, err = io.Copy(w, bytes.NewReader(v))
if err != nil {
log.Error().Err(err).Int("status", http.StatusInternalServerError).Msg("failed to write storage ref")
if count == 0 {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
log.Warn().Err(err).Msgf("failed to write storage ref: %+v", ref)
return
}
count++
Expand All @@ -156,13 +154,14 @@ func (h Handler) getStorageRefByURN(w http.ResponseWriter, r *http.Request) {

storageRef, err := h.StorageRefResolver.Resolve(r.Context(), urn)
if err != nil {
msg := fmt.Sprintf("failed to resolve storage reference of urn: %v", err)
http.Error(w, msg, http.StatusInternalServerError)
err := fmt.Errorf("failed to resolve storage ref: %s: %w", urn, err)
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("")
return
}
_, err = fmt.Fprintln(w, storageRef)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Warn().Err(err).Msgf("Failed to write storage ref: %s", storageRef)
}
}

Expand All @@ -175,6 +174,7 @@ func (h Handler) listFiles(w http.ResponseWriter, r *http.Request) {

if err := h.FileAPI.ListFileInfo(ctx, limit, responses); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed to list files")
return
}

Expand All @@ -191,14 +191,15 @@ func (h Handler) listFiles(w http.ResponseWriter, r *http.Request) {
}
v, err := protojson.Marshal(res.Fileinfo)
if err != nil {
log.Warn().Err(err).Msg("failed to marshal storage ref")
log.Warn().Err(err).Msg("failed to marshal file info")
continue
}
if count > 0 {
_, _ = w.Write([]byte("\r\n"))
}
_, err = io.Copy(w, bytes.NewReader(v))
if err != nil {
log.Error().Err(err).Int("status", http.StatusInternalServerError).Msg("failed to write storage ref")
log.Warn().Err(err).Msg("failed to write file info")
return
}
count++
Expand All @@ -215,11 +216,12 @@ func (h Handler) getFileInfoByFilename(w http.ResponseWriter, r *http.Request) {
fileInfo, err := h.FileAPI.GetFileInfo(ctx, filename)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msgf("Failed to get file info: %s", filename)
return
}
_, err = fmt.Fprintln(w, protojson.Format(fileInfo))
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Warn().Err(err).Msgf("Failed to write file info: %s", protojson.Format(fileInfo))
}
}

Expand All @@ -231,6 +233,7 @@ func (h Handler) listCdxs(w http.ResponseWriter, r *http.Request) {

if err := h.CdxAPI.List(ctx, limit, responses); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed to list cdx records")
return
}

Expand All @@ -255,11 +258,7 @@ func (h Handler) listCdxs(w http.ResponseWriter, r *http.Request) {
}
_, err = io.Copy(w, bytes.NewReader(v))
if err != nil {
log.Error().Err(err).Int("status", http.StatusInternalServerError).Msg("failed to write result")
if count == 0 {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
log.Warn().Err(err).Msg("failed to write cdx record")
return
}
count++
Expand All @@ -274,23 +273,18 @@ func (h Handler) loadRecordByUrn(w http.ResponseWriter, r *http.Request) {
defer cancel()

record, err := h.WarcLoader.LoadById(ctx, warcId)
if err != nil {
msg := fmt.Sprintf("failed to load record '%s': %v", warcId, err)
http.Error(w, msg, http.StatusInternalServerError)
return
if record != nil {
defer record.Close()
}
defer func() {
if err := record.Close(); err != nil {
log.Warn().Err(err).Msgf("Closing record: %v", record)
}
}()

n, err := handlers.RenderRecord(w, record)
if n == 0 {
if err != nil {
err := fmt.Errorf("failed to load record '%s': %w", warcId, err)
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("")
return
}
_, err = handlers.RenderRecord(w, record)
if err != nil {
log.Warn().Err(err).Msgf("Failed to write record: %v", record)
log.Warn().Err(err).Msgf("Failed to write record '%s': %v", warcId, record)
}
}

Expand Down
44 changes: 28 additions & 16 deletions server/warcserver/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,17 @@ func (h Handler) index(w http.ResponseWriter, r *http.Request) {
start := time.Now()
count := 0
defer func() {
if count > 0 {
log.Debug().Msgf("Found %d items in %s", count, time.Since(start))
}
log.Debug().Msgf("Found %d items in %s", count, time.Since(start))
}()

ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
defer cancel()

response := make(chan index.CdxResponse)
searchApi := api.SearchAPI{CoreAPI: coreAPI}

if err = h.CdxAPI.Search(ctx, searchApi, response); err != nil {
log.Error().Err(err).Msg("search failed")
if err = h.CdxAPI.Search(ctx, api.SearchAPI{CoreAPI: coreAPI}, response); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msgf("Search failed: %+v", coreAPI)
return
}

Expand All @@ -74,9 +72,9 @@ func (h Handler) index(w http.ResponseWriter, r *http.Request) {
}
if err != nil {
log.Warn().Err(err).Msg("failed to write result")
} else {
count++
return
}
count++
}
}

Expand All @@ -95,15 +93,15 @@ func (h Handler) resource(w http.ResponseWriter, r *http.Request) {
response := make(chan index.CdxResponse)
err = h.CdxAPI.Closest(ctx, closestReq, response)
if err != nil {
log.Error().Err(err).Msg("failed to query closest cdx")
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msgf("Failed search closest: %+v", closestReq)
return
}

var res index.CdxResponse
for res = range response {
if res.Error != nil {
log.Warn().Err(err).Msg("failed cdx response")
log.Warn().Err(err).Msg("Failed cdx response")
continue
}
if res.Cdx == nil {
Expand All @@ -127,15 +125,19 @@ func (h Handler) resource(w http.ResponseWriter, r *http.Request) {
var errResolveRevisit loader.ErrResolveRevisit
if errors.As(err, &errResolveRevisit) {
http.Error(w, errResolveRevisit.Error(), http.StatusNotImplemented)
log.Error().Err(errResolveRevisit).Msg("Failed to load record")
return
}
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed to load record")
return
}

block, ok := warcRecord.Block().(gowarc.HttpResponseBlock)
if !ok {
http.Error(w, fmt.Sprintf("Record not renderable: %s", warcRecord), http.StatusInternalServerError)
err := fmt.Errorf("record not renderable: %s", warcRecord)
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed to load resource")
return
}

Expand All @@ -145,32 +147,39 @@ func (h Handler) resource(w http.ResponseWriter, r *http.Request) {
p, err := block.PayloadBytes()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed to load resource")
return
}
err = handlers.Render(w, *block.HttpHeader(), block.HttpStatusCode(), p)
if err != nil {
log.Warn().Err(err).Msg("Failed to render response")
log.Warn().Err(err).Msg("Failed to load resource")
}
return
}

// handle redirect
location := block.HttpHeader().Get("Location")
if location == "" {
http.Error(w, "Redirected to empty location", http.StatusInternalServerError)
err := errors.New("empty redirect location")
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed to load resource")
return
}

locUrl, err := url.Parse(location)
if urlErrors.Code(err) == urlErrors.FailRelativeUrlWithNoBase {
locUrl, err = url.ParseRef(closestReq.rawUrl, location)
if err != nil {
http.Error(w, fmt.Sprintf("Failed to parse relative location header as URL: %s: %s: %v", warcRecord, location, err), http.StatusInternalServerError)
err = fmt.Errorf("failed to parse relative location header as URL: %s: %s: %w", warcRecord, location, err)
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed to load resource")
return
}
}
if err != nil {
http.Error(w, fmt.Sprintf("Failed to parse location header as URL: %s: %s: %v", warcRecord, location, err), http.StatusInternalServerError)
err = fmt.Errorf("failed to parse location header as URL: %s: %s: %v", warcRecord, location, err)
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed to load resource")
return
}

Expand All @@ -183,6 +192,7 @@ func (h Handler) resource(w http.ResponseWriter, r *http.Request) {
err = h.Closest(ctx, closestReq, response)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed to find closest redirect")
return
}

Expand All @@ -192,7 +202,7 @@ func (h Handler) resource(w http.ResponseWriter, r *http.Request) {

for res := range response {
if res.Error != nil {
log.Warn().Err(err).Msg("")
log.Warn().Err(err).Msg("failed result")
continue
}
sts = timestamp.TimeTo14(res.GetSts().AsTime())
Expand All @@ -210,7 +220,9 @@ func (h Handler) resource(w http.ResponseWriter, r *http.Request) {
host := r.Host
u, err := url.Parse(scheme + "://" + host)
if err != nil {
err := fmt.Errorf("failed to construct redirect location: %s: %v", uri, err)
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error().Err(err).Msg("Failed load resource")
return
}
u.SetPathname(path)
Expand Down

0 comments on commit 6de6858

Please sign in to comment.