lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcp4d: only publish to MQTT when channel is ready to prevent deadlocks

Browse Source
This commit is contained in:
Michael Stapelberg 2020-12-31 16:42:12 +01:00
parent c3c531931c
commit 5f25043b94
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/dhcp4d/dhcp4d.go
View File

@ -420,10 +420,16 @@ func newSrv(permDir string) (*srv, error) {
if identifier == "" { if identifier == "" {
identifier = latest.HardwareAddr identifier = latest.HardwareAddr
} }
mayqtt <- PublishRequest{ select {
case mayqtt <- PublishRequest{
Topic: "router7/dhcp4d/lease/" + identifier, Topic: "router7/dhcp4d/lease/" + identifier,
Retained: true, Retained: true,
Payload: leaseJSON, Payload: leaseJSON,
}:
default:
// Channel not ready? skip publishing this lease (best-effort).
// This is an easy way of breaking circular dependencies between
// MQTT broker and DHCP server, and avoiding deadlocks.
} }
} }
conn, err := conn.NewUDP4BoundListener(*iface, ":67") conn, err := conn.NewUDP4BoundListener(*iface, ":67")