lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/dns: bound time we wait on restarting systemd-resolved in another place 

Fixes #3629
Updates #3537

Change-Id: I5d4b6acfcfdf0e3efcf6eb49c5e6cf4521e4baed
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/3631/head
Brad Fitzpatrick 2021-12-28 09:58:57 -08:00 committed by Brad Fitzpatrick
parent 44937b59e7
commit eb26c081b1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/dns/direct.go
View File

@ -344,7 +344,14 @@ func (m *directManager) SetDNS(config OSConfig) (err error) {
// cause a disruptive DNS outage each time we reset an empty // cause a disruptive DNS outage each time we reset an empty
// OS configuration. // OS configuration.
if changed && isResolvedRunning() && !runningAsGUIDesktopUser() { if changed && isResolvedRunning() && !runningAsGUIDesktopUser() {
exec.Command("systemctl", "restart", "systemd-resolved.service").Run() t0 := time.Now()
err := restartResolved()
d := time.Since(t0).Round(time.Millisecond)
if err != nil {
m.logf("error restarting resolved after %v: %v", d, err)
} else {
m.logf("restarted resolved after %v", d)
}
} }
return nil return nil