GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-25 05:19:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2161 from slingamn/logerror

Browse Source 
fix #2141
This commit is contained in:
Shivaram Lingamneni 2024-05-29 08:25:42 +02:00 committed by GitHub
commit 60f7d1122d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
irc/listeners.go
View File

@ -5,6 +5,7 @@ package irc
import ( import (
"errors" "errors"
"io/fs"
"net" "net"
"net/http" "net/http"
"os" "os"
@ -29,7 +30,7 @@ type IRCListener interface {
// NewListener creates a new listener according to the specifications in the config file // NewListener creates a new listener according to the specifications in the config file
func NewListener(server *Server, addr string, config utils.ListenerConfig, bindMode os.FileMode) (result IRCListener, err error) { func NewListener(server *Server, addr string, config utils.ListenerConfig, bindMode os.FileMode) (result IRCListener, err error) {
baseListener, err := createBaseListener(addr, bindMode) baseListener, err := createBaseListener(server, addr, bindMode)
if err != nil { if err != nil {
return return
} }
@ -43,11 +44,14 @@ func NewListener(server *Server, addr string, config utils.ListenerConfig, bindM
} }
} }
func createBaseListener(addr string, bindMode os.FileMode) (listener net.Listener, err error) { func createBaseListener(server *Server, addr string, bindMode os.FileMode) (listener net.Listener, err error) {
addr = strings.TrimPrefix(addr, "unix:") addr = strings.TrimPrefix(addr, "unix:")
if strings.HasPrefix(addr, "/") { if strings.HasPrefix(addr, "/") {
// https://stackoverflow.com/a/34881585 // https://stackoverflow.com/a/34881585
os.Remove(addr) removeErr := os.Remove(addr)
if removeErr != nil && !errors.Is(removeErr, fs.ErrNotExist) {
server.logger.Warning("listeners", "could not delete unix domain listener", addr, removeErr.Error())
}
listener, err = net.Listen("unix", addr) listener, err = net.Listen("unix", addr)
if err == nil && bindMode != 0 { if err == nil && bindMode != 0 {
os.Chmod(addr, bindMode) os.Chmod(addr, bindMode)