diff options
author | Matthew Holt <[email protected]> | 2023-06-21 17:59:54 -0600 |
---|---|---|
committer | Matthew Holt <[email protected]> | 2023-06-21 17:59:54 -0600 |
commit | 2b2addebb8cc5dfc7d4d1d34c82f3c46159fea12 (patch) | |
tree | c59228edb42936d4127f1e119bd5341da0171fab | |
parent | 9563666bfb93f1708b044c7b1e5d0aa91afd029a (diff) | |
download | caddy-2.7.0-beta.2.tar.gz caddy-2.7.0-beta.2.zip |
Appease linterv2.7.0-beta.2
-rw-r--r-- | listen_unix.go | 20 | ||||
-rw-r--r-- | listeners.go | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/listen_unix.go b/listen_unix.go index e31ecac74..8870da5e9 100644 --- a/listen_unix.go +++ b/listen_unix.go @@ -138,6 +138,26 @@ func reusePort(network, address string, conn syscall.RawConn) error { }) } +type unixListener struct { + *net.UnixListener + mapKey string + count *int32 // accessed atomically +} + +func (uln *unixListener) Close() error { + newCount := atomic.AddInt32(uln.count, -1) + if newCount == 0 { + defer func() { + addr := uln.Addr().String() + unixSocketsMu.Lock() + delete(unixSockets, uln.mapKey) + unixSocketsMu.Unlock() + _ = syscall.Unlink(addr) + }() + } + return uln.UnixListener.Close() +} + // deleteListener is a type that simply deletes itself // from the listenerPool when it closes. It is used // solely for the purpose of reference counting (i.e. diff --git a/listeners.go b/listeners.go index 08bdbcf7a..1387d385b 100644 --- a/listeners.go +++ b/listeners.go @@ -694,26 +694,6 @@ func RegisterNetwork(network string, getListener ListenerFunc) { networkTypes[network] = getListener } -type unixListener struct { - *net.UnixListener - mapKey string - count *int32 // accessed atomically -} - -func (uln *unixListener) Close() error { - newCount := atomic.AddInt32(uln.count, -1) - if newCount == 0 { - defer func() { - addr := uln.Addr().String() - unixSocketsMu.Lock() - delete(unixSockets, uln.mapKey) - unixSocketsMu.Unlock() - _ = syscall.Unlink(addr) - }() - } - return uln.UnixListener.Close() -} - type unixConn struct { *net.UnixConn filename string |