Skip to content

Commit 5af9834

Browse files
use caddy.Listener
1 parent 1ba779f commit 5af9834

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

listeners.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package proxyprotocol
22

33
import (
44
"net"
5-
"os"
65

76
proxyproto "github.com/armon/go-proxyproto"
87
"github.com/mholt/caddy"
@@ -11,25 +10,15 @@ import (
1110
type Configs []Config
1211

1312
type Listener struct {
14-
net.Listener
13+
caddy.Listener
1514
Configs []Config
1615
}
17-
type CaddyListener struct {
18-
*Listener
19-
}
20-
21-
func (c *CaddyListener) File() (*os.File, error) {
22-
return c.Listener.Listener.(caddy.Listener).File()
23-
}
2416

25-
func (c Configs) NewListener(l net.Listener) net.Listener {
17+
func (c Configs) NewListener(l caddy.Listener) caddy.Listener {
2618
ln := &Listener{
2719
Listener: l,
2820
Configs: []Config(c),
2921
}
30-
if _, ok := l.(caddy.Listener); ok {
31-
return &CaddyListener{Listener: ln}
32-
}
3322
return ln
3423
}
3524

0 commit comments

Comments
 (0)