mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

control/controlclient: adjust some logging point names

Browse Source 
The previous code read too explicitly like log.Printf("I am here1"),
log.Printf("I am here2"). It still is with this change, but prettier, and
less subject to code rearranging order.
This commit is contained in:
Brad Fitzpatrick
2020-10-13 15:03:56 -07:00
parent 1fd9958e9d
commit 82f2fdc194
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
control/controlclient/auto.go
View File

@ -288,7 +288,7 @@ func (c *Client) authRoutine() {
// don't send status updates for context errors, // don't send status updates for context errors,
// since context cancelation is always on purpose. // since context cancelation is always on purpose.
if ctx.Err() == nil { if ctx.Err() == nil {
c.sendStatus("authRoutine1", err, "", nil) c.sendStatus("authRoutine-report", err, "", nil)
} }
} }
@ -353,7 +353,7 @@ func (c *Client) authRoutine() {
c.synced = false c.synced = false
c.mu.Unlock() c.mu.Unlock()
c.sendStatus("authRoutine2", nil, "", nil) c.sendStatus("authRoutine-wantout", nil, "", nil)
bo.BackOff(ctx, nil) bo.BackOff(ctx, nil)
} else { // ie. goal.wantLoggedIn } else { // ie. goal.wantLoggedIn
c.mu.Lock() c.mu.Lock()
@ -394,7 +394,7 @@ func (c *Client) authRoutine() {
c.synced = false c.synced = false
c.mu.Unlock() c.mu.Unlock()
c.sendStatus("authRoutine3", err, url, nil) c.sendStatus("authRoutine-url", err, url, nil)
bo.BackOff(ctx, err) bo.BackOff(ctx, err)
continue continue
} }
@ -406,7 +406,7 @@ func (c *Client) authRoutine() {
c.state = StateAuthenticated c.state = StateAuthenticated
c.mu.Unlock() c.mu.Unlock()
c.sendStatus("authRoutine4", nil, "", nil) c.sendStatus("authRoutine-success", nil, "", nil)
c.cancelMapSafely() c.cancelMapSafely()
bo.BackOff(ctx, nil) bo.BackOff(ctx, nil)
} }
@ -528,7 +528,7 @@ func (c *Client) mapRoutine() {
c.logf("mapRoutine: netmap received: %s", state) c.logf("mapRoutine: netmap received: %s", state)
if stillAuthed { if stillAuthed {
c.sendStatus("mapRoutine2", nil, "", nm) c.sendStatus("mapRoutine-got-netmap", nil, "", nm)
} }
}) })