Skip to content

Commit 2ad1dfb

Browse files
committed
MINOR: switch to s6 reload if socket reload fails
1 parent 9cc03a0 commit 2ad1dfb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pkg/haproxy/process/s6-overlay.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ func (d *s6Control) Service(action string) error {
5858
case "reload":
5959
if d.masterSocketValid {
6060
msg, err := d.masterSocket.Reload()
61-
if err != nil {
62-
d.logger.Error(err)
61+
if err == nil {
62+
d.logger.Debug(msg)
63+
return nil
6364
}
64-
d.logger.Debug(msg)
65-
return err
65+
d.logger.Error(err)
6666
}
6767

6868
cmd = exec.Command("s6-svc", "-2", "/run/service/haproxy")

0 commit comments

Comments
 (0)