Skip to content

Fix internal server error regressions #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbkempf merged 3 commits into from
Jun 5, 2025
Merged

Fix internal server error regressions #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c6a40d
config: Make the fallback struct public
elboulangero Jun 4, 2025
5301b14
http: Add testing for mirror handler
elboulangero Jun 4, 2025
59d041a
http: Fix "Internal Server Error" regressions
elboulangero Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ type Configuration struct {
WeightDistributionRange float32 `yaml:"WeightDistributionRange"`
DisableOnMissingFile bool `yaml:"DisableOnMissingFile"`
AllowOutdatedFiles []OutdatedFilesConfig `yaml:"AllowOutdatedFiles"`
Fallbacks []fallback `yaml:"Fallbacks"`
Fallbacks []Fallback `yaml:"Fallbacks"`

RedisSentinelMasterName string `yaml:"RedisSentinelMasterName"`
RedisSentinels []sentinels `yaml:"RedisSentinels"`
Expand All @@ -100,7 +100,7 @@ type Configuration struct {
RPCPassword string `yaml:"RPCPassword"`
}

type fallback struct {
type Fallback struct {
URL string `yaml:"URL"`
CountryCode string `yaml:"CountryCode"`
ContinentCode string `yaml:"ContinentCode"`
Expand Down
7 changes: 3 additions & 4 deletions http/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,12 +333,11 @@ func (h *HTTP) mirrorHandler(w http.ResponseWriter, r *http.Request, ctx *Contex
return
}

// Get details about the requested file
// Get details about the requested file. Errors are not fatal, and
// expected when the database is not ready: fallbacks will handle it.
fileInfo, err := h.cache.GetFileInfo(urlPath)
if err != nil {
log.Errorf("Error while fetching Fileinfo: %s", err.Error())
http.Error(w, err.Error(), http.StatusInternalServerError)
return
//log.Debugf("Error while fetching Fileinfo: %s", err.Error())
}

if checkIfModifiedSince(r, fileInfo.ModTime) == condFalse {
Expand Down
Loading