devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-26 08:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Ignoe derp.yaml, don't panic in Serve()

Browse source
This commit is contained in:
Eugen 2021-12-01 19:32:47 +01:00
parent 07a437c707
commit 7e95b3501d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -17,6 +17,7 @@
/headscale /headscale
config.json config.json
config.yaml config.yaml
derp.yaml
*.key *.key
/db.sqlite /db.sqlite
*.sqlite3 *.sqlite3

6
app.go
View file

@ -418,12 +418,12 @@ func (h *Headscale) Serve() error {
err = h.ensureUnixSocketIsAbsent() err = h.ensureUnixSocketIsAbsent()
if err != nil { if err != nil {
panic(err) return err
} }
socketListener, err := net.Listen("unix", h.cfg.UnixSocket) socketListener, err := net.Listen("unix", h.cfg.UnixSocket)
if err != nil { if err != nil {
panic(err) return err
} }
// Handle common process-killing signals so we can gracefully shut down: // Handle common process-killing signals so we can gracefully shut down:
@ -441,7 +441,7 @@ func (h *Headscale) Serve() error {
networkListener, err := net.Listen("tcp", h.cfg.Addr) networkListener, err := net.Listen("tcp", h.cfg.Addr)
if err != nil { if err != nil {
panic(err) return err
} }
// Create the cmux object that will multiplex 2 protocols on the same port. // Create the cmux object that will multiplex 2 protocols on the same port.