Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
Rename handler modules to use http.handlers namespace
Matthew Holt committed
Jul 11, 2019 at 22:03 UTC
63674ba081dcf0a1b0ba8d6966fa5874850e3ee3
7 files changed
+18
-10
modules/caddyhttp/caddylog/log.go
+1
-1
@@ -25,7 +25,7 @@ import (
25
26
func init() {
27
caddy.RegisterModule(caddy.Module{
28
- Name: "http.middleware.log",
28
+ Name: "http.handlers.log",
29
New: func() interface{} { return new(Log) },
30
})
31
}
modules/caddyhttp/headers/headers.go
+1
-1
@@ -24,7 +24,7 @@ import (
24
25
func init() {
26
caddy.RegisterModule(caddy.Module{
27
- Name: "http.middleware.headers",
27
+ Name: "http.handlers.headers",
28
New: func() interface{} { return new(Headers) },
29
})
30
}
modules/caddyhttp/markdown/markdown.go
+1
-1
@@ -29,7 +29,7 @@ import (
29
30
func init() {
31
caddy.RegisterModule(caddy.Module{
32
- Name: "http.middleware.markdown",
32
+ Name: "http.handlers.markdown",
33
New: func() interface{} { return new(Markdown) },
34
})
35
}
modules/caddyhttp/requestbody/requestbody.go
+1
-1
@@ -23,7 +23,7 @@ import (
23
24
func init() {
25
caddy.RegisterModule(caddy.Module{
26
- Name: "http.middleware.request_body",
26
+ Name: "http.handlers.request_body",
27
New: func() interface{} { return new(RequestBody) },
28
})
29
}
modules/caddyhttp/reverseproxy/module.go
+1
-1
@@ -21,7 +21,7 @@ import (
21
// Register caddy module.
22
func init() {
23
caddy.RegisterModule(caddy.Module{
24
- Name: "http.responders.reverse_proxy",
24
+ Name: "http.handlers.reverse_proxy",
25
New: func() interface{} { return new(LoadBalanced) },
26
})
27
}
modules/caddyhttp/reverseproxy/upstream.go
+12
-4
@@ -28,6 +28,7 @@ import (
28
"sync/atomic"
29
"time"
30
31
+ "github.com/caddyserver/caddy/modules/caddyhttp"
32
"github.com/caddyserver/caddy/v2"
33
)
34
@@ -120,7 +121,7 @@ func NewLoadBalancedReverseProxy(lb *LoadBalanced, ctx caddy.Context) error {
121
}
122
123
// setup any configured circuit breakers
123
- var cbModule = "http.responders.reverse_proxy.circuit_breaker"
124
+ var cbModule = "http.handlers.reverse_proxy.circuit_breaker"
125
var cb CircuitBreaker
126
127
if uc.CircuitBreaker != nil {
@@ -209,9 +210,9 @@ func (lb *LoadBalanced) Provision(ctx caddy.Context) error {
210
return NewLoadBalancedReverseProxy(lb, ctx)
211
}
212
212
-// ServeHTTP implements the http.Handler interface to dispatch an http request to the proper
213
-// server.
214
-func (lb *LoadBalanced) ServeHTTP(w http.ResponseWriter, r *http.Request) error {
213
+// ServeHTTP implements the caddyhttp.MiddlewareHandler interface to
214
+// dispatch an HTTP request to the proper server.
215
+func (lb *LoadBalanced) ServeHTTP(w http.ResponseWriter, r *http.Request, _ caddyhttp.Handler) error {
216
// ensure requests don't hang if an upstream does not respond or is not eventually healthy
217
var u *upstream
218
var done bool
@@ -440,3 +441,10 @@ func newReverseProxy(target *url.URL, setHealthiness func(bool)) *ReverseProxy {
441
rp.Transport = defaultTransport // use default transport that times out in 5 seconds
442
return rp
443
}
444
+
445
+// Interface guards
446
+var (
447
+ _ caddyhttp.MiddlewareHandler = (*LoadBalanced)(nil)
448
+ _ caddy.Provisioner = (*LoadBalanced)(nil)
449
+ _ caddy.CleanerUpper = (*LoadBalanced)(nil)
450
+)
modules/caddyhttp/table.go
+1
-1
@@ -22,7 +22,7 @@ import (
22
23
func init() {
24
caddy.RegisterModule(caddy.Module{
25
- Name: "http.middleware.table",
25
+ Name: "http.handlers.table",
26
New: func() interface{} { return new(tableMiddleware) },
27
})
28