TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-12-12 19:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

tsnet: do not log using log.Printf by default

Browse Source 
Printing to log.Printf by default made sense when there was
no automatic uploading to log.tailscale.io.
However, now that we support that by default,
logging to log.Printf if Server.Logf is nil seems superfluous.

The tsnet package is also intended to be instantiated as a library.
Thus, a single process can multiple tsnet instances running simultaneously.
The default behavior of each logging to log.Printf makes the
os.Stderr  of the main process unreadable.

Signed-off-by: Joe Tsai <joetsai@digital-static.net>
This commit is contained in:
Joe Tsai 2022-06-09 14:52:43 -07:00
parent 96f73b3894
commit 840785fcd9
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tsnet/tsnet.go
View File

@ -11,7 +11,6 @@
"context" "context"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log"
"net" "net"
"net/http" "net/http"
"os" "os"
@ -62,8 +61,8 @@ type Server struct {
// If empty, the binary name is used. // If empty, the binary name is used.
Hostname string Hostname string
// Logf, if non-nil, specifies the logger to use. By default, // Logf, if non-nil, specifies an additional logger to use such that
// log.Printf is used. // logs are both written here and uploaded to log.tailscale.io.
Logf logger.Logf Logf logger.Logf
// Ephemeral, if true, specifies that the instance should register // Ephemeral, if true, specifies that the instance should register
@ -331,9 +330,7 @@ func (s *Server) logf(format string, a ...interface{}) {
} }
if s.Logf != nil { if s.Logf != nil {
s.Logf(format, a...) s.Logf(format, a...)
return
} }
log.Printf(format, a...)
} }
// printAuthURLLoop loops once every few seconds while the server is still running and // printAuthURLLoop loops once every few seconds while the server is still running and