TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-22 08:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: simplify loadStateLocked control flow a bit, restore logging

Browse Source 
The common Linux start-up path (fallback file defined but not
existing) was missing the log print of initializing Prefs. The code
was too twisty. Simplify a bit.

Updates #1573

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-04-02 07:56:07 -07:00
parent a39d2403bc
commit d50406f185
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ipn/ipnlocal/local.go
View File

@ -1061,17 +1061,20 @@ func (b *LocalBackend) loadStateLocked(key ipn.StateKey, prefs *ipn.Prefs, legac
bs, err := b.store.ReadState(key) bs, err := b.store.ReadState(key)
switch { switch {
case errors.Is(err, ipn.ErrStateNotExist): case errors.Is(err, ipn.ErrStateNotExist):
loaded := false
if legacyPath != "" { if legacyPath != "" {
b.prefs, err = ipn.LoadPrefs(legacyPath) b.prefs, err = ipn.LoadPrefs(legacyPath)
if err != nil { switch {
if !errors.Is(err, os.ErrNotExist) { case errors.Is(err, os.ErrNotExist):
b.logf("failed to load legacy prefs: %v", err) // Quiet. Normal case.
} case err != nil:
b.prefs = ipn.NewPrefs() b.logf("failed to load legacy prefs: %v", err)
} else { default:
loaded = true
b.logf("imported prefs from relaynode for %q: %v", key, b.prefs.Pretty()) b.logf("imported prefs from relaynode for %q: %v", key, b.prefs.Pretty())
} }
} else { }
if !loaded {
b.prefs = ipn.NewPrefs() b.prefs = ipn.NewPrefs()
b.logf("created empty state for %q: %s", key, b.prefs.Pretty()) b.logf("created empty state for %q: %s", key, b.prefs.Pretty())
} }