serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 06:03:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better error handling in CLI commands

Browse source
This commit is contained in:
Matthew Holt 2019-07-07 16:39:21 -06:00
parent 42acdad9e5
commit 4eb5fc541b
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/commands.go
View file

@ -100,7 +100,9 @@ func cmdStart() (int, error) {
for { for {
conn, err := ln.Accept() conn, err := ln.Accept()
if err != nil { if err != nil {
log.Println(err) if !strings.Contains(err.Error(), "use of closed network connection") {
log.Println(err)
}
break break
} }
err = handlePingbackConn(conn, expect) err = handlePingbackConn(conn, expect)
@ -114,8 +116,8 @@ func cmdStart() (int, error) {
// in another goroutine, we await the failure of the child process // in another goroutine, we await the failure of the child process
go func() { go func() {
err = cmd.Wait() // don't send on this line! Wait blocks, but send starts before it unblocks err := cmd.Wait() // don't send on this line! Wait blocks, but send starts before it unblocks
exit <- err // sending on separate line ensures select won't trigger until after Wait unblocks exit <- err // sending on separate line ensures select won't trigger until after Wait unblocks
}() }()
// when one of the goroutines unblocks, we're done and can exit // when one of the goroutines unblocks, we're done and can exit
@ -154,7 +156,7 @@ func cmdRun() (int, error) {
// start the admin endpoint along with any initial config // start the admin endpoint along with any initial config
err := caddy.StartAdmin(config) err := caddy.StartAdmin(config)
if err != nil { if err != nil {
return 0, fmt.Errorf("starting caddy administration endpoint: %v", err) return 1, fmt.Errorf("starting caddy administration endpoint: %v", err)
} }
defer caddy.StopAdmin() defer caddy.StopAdmin()