diff options
| author | Bart <info@bartfokker.com> | 2020-07-31 22:54:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 16:54:18 -0600 |
| commit | af5c148ed1d8e405978b71e7efe15d0a829cab50 (patch) | |
| tree | 688bd785a2263e66fb93797abc7a376a3c02726d /modules | |
| parent | 514eef33fe6ea4e52438e62f73c8f3c0aadd45db (diff) | |
admin,templates,core: Minor enhancements and error handling (#3607)
* fix 2 possible bugs
* handle unhandled errors
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/caddyhttp/reverseproxy/selectionpolicies.go | 3 | ||||
| -rw-r--r-- | modules/caddyhttp/templates/tplcontext_test.go | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/caddyhttp/reverseproxy/selectionpolicies.go b/modules/caddyhttp/reverseproxy/selectionpolicies.go index 7c36dec..e33ebe4 100644 --- a/modules/caddyhttp/reverseproxy/selectionpolicies.go +++ b/modules/caddyhttp/reverseproxy/selectionpolicies.go @@ -401,6 +401,9 @@ func leastRequests(upstreams []*Upstream) *Upstream { best = append(best, upstream) } } + if len(best) == 0 { + return nil + } return best[weakrand.Intn(len(best))] } diff --git a/modules/caddyhttp/templates/tplcontext_test.go b/modules/caddyhttp/templates/tplcontext_test.go index 32c6a16..c0658a1 100644 --- a/modules/caddyhttp/templates/tplcontext_test.go +++ b/modules/caddyhttp/templates/tplcontext_test.go @@ -90,7 +90,7 @@ func TestCookie(t *testing.T) { }, { // cookie with optional fields - cookie: &http.Cookie{Name: "cookie", Value: "cookieValue", Path: "/path", Domain: "https://localhost", Expires: (time.Now().Add(10 * time.Minute)), MaxAge: 120}, + cookie: &http.Cookie{Name: "cookie", Value: "cookieValue", Path: "/path", Domain: "https://localhost", Expires: time.Now().Add(10 * time.Minute), MaxAge: 120}, cookieName: "cookie", expect: "cookieValue", }, |