mirrors/yggdrasil-go
2
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go synced 2024-10-22 07:30:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use UNIX socket patch from url struct (#1186)

Browse Source 
No need to extract it again when the url package provides it for us:
```
$ jq -n '{"AdminListen":"unix:///tmp/ygg.sock"}' | ./yggdrasil -useconf | grep 'admin socket'
2024/10/08 22:41:11 UNIX admin socket listening on /tmp/ygg.sock
```

Follow-up on #1176
This commit is contained in:
Klemens Nanni 2024-10-17 15:22:46 +03:00 committed by GitHub
parent 1ee61dcefa
commit a6429390da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/admin/admin.go
View File

@ -238,28 +238,27 @@ func (a *AdminSocket) listen() {
if err == nil { if err == nil {
switch strings.ToLower(u.Scheme) { switch strings.ToLower(u.Scheme) {
case "unix": case "unix":
file := strings.TrimPrefix(listenaddr, "unix://") if _, err := os.Stat(u.Path); err == nil {
if _, err := os.Stat(file); err == nil { a.log.Debugln("Admin socket", u.Path, "already exists, trying to clean up")
a.log.Debugln("Admin socket", file, "already exists, trying to clean up") if _, err := net.DialTimeout("unix", u.Path, time.Second*2); err == nil || err.(net.Error).Timeout() {
if _, err := net.DialTimeout("unix", file, time.Second*2); err == nil || err.(net.Error).Timeout() { a.log.Errorln("Admin socket", u.Path, "already exists and is in use by another process")
a.log.Errorln("Admin socket", file, "already exists and is in use by another process")
os.Exit(1) os.Exit(1)
} else { } else {
if err := os.Remove(file); err == nil { if err := os.Remove(u.Path); err == nil {
a.log.Debugln(file, "was cleaned up") a.log.Debugln(u.Path, "was cleaned up")
} else { } else {
a.log.Errorln(file, "already exists and was not cleaned up:", err) a.log.Errorln(u.Path, "already exists and was not cleaned up:", err)
os.Exit(1) os.Exit(1)
} }
} }
} }
a.listener, err = net.Listen("unix", file) a.listener, err = net.Listen("unix", u.Path)
if err == nil { if err == nil {
switch file[:1] { switch u.Path[:1] {
case "@": // maybe abstract namespace case "@": // maybe abstract namespace
default: default:
if err := os.Chmod(file, 0660); err != nil { if err := os.Chmod(u.Path, 0660); err != nil {
a.log.Warnln("WARNING:", file, "may have unsafe permissions!") a.log.Warnln("WARNING:", u.Path, "may have unsafe permissions!")
} }
} }
} }