TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use logger.Logf consistently. It was used in most places.

Browse Source 
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2020-02-11 09:37:20 -08:00
parent c1917710ad
commit a59dc5f155
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
derp/derp_client.go
View File

@ -15,18 +15,19 @@
"golang.org/x/crypto/curve25519"
"golang.org/x/crypto/nacl/box"
"tailscale.com/logger"
)
type Client struct {
serverKey [32]byte
privateKey [32]byte // TODO(crawshaw): make this wgcfg.PrivateKey?
publicKey [32]byte
logf func(format string, args ...interface{})
logf logger.Logf
netConn net.Conn
conn *bufio.ReadWriter
}
func NewClient(privateKey [32]byte, netConn net.Conn, conn *bufio.ReadWriter, logf func(format string, args ...interface{})) (*Client, error) {
func NewClient(privateKey [32]byte, netConn net.Conn, conn *bufio.ReadWriter, logf logger.Logf) (*Client, error) {
c := &Client{
privateKey: privateKey,
logf: logf,

5
derp/derp_server.go
View File

@ -23,6 +23,7 @@
"golang.org/x/crypto/curve25519"
"golang.org/x/crypto/nacl/box"
"tailscale.com/logger"
)
const magic = 0x44c55250 // "DERP" with a non-ASCII high-bit
@ -44,14 +45,14 @@
type Server struct {
privateKey [32]byte // TODO(crawshaw): make this wgcfg.PrivateKey?
publicKey [32]byte
logf func(format string, args ...interface{})
logf logger.Logf
mu sync.Mutex
netConns map[net.Conn]chan struct{}
clients map[[32]byte]*client
}
func NewServer(privateKey [32]byte, logf func(format string, args ...interface{})) *Server {
func NewServer(privateKey [32]byte, logf logger.Logf) *Server {
s := &Server{
privateKey: privateKey,
logf: logf,

7
derp/derphttp/derphttp_client.go
View File

@ -23,6 +23,7 @@
"sync"
"tailscale.com/derp"
"tailscale.com/logger"
)
// Client is a DERP-over-HTTP client.
@ -32,7 +33,7 @@
// Send/Recv will completely re-establish the connection.
type Client struct {
privateKey [32]byte
logf func(format string, args ...interface{})
logf logger.Logf
closed chan struct{}
url *url.URL
resp *http.Response
@ -44,13 +45,13 @@ type Client struct {
client *derp.Client
}
func NewClient(privateKey [32]byte, serverURL string, logf func(format string, args ...interface{})) (c *Client, err error) {
func NewClient(privateKey [32]byte, serverURL string, logf logger.Logf) (*Client, error) {
u, err := url.Parse(serverURL)
if err != nil {
return nil, fmt.Errorf("derphttp.NewClient: %v", err)
}
c = &Client{
c := &Client{
privateKey: privateKey,
logf: logf,
url: u,

4
wgengine/rusage.go
View File

@ -7,9 +7,11 @@
import (
"fmt"
"runtime"
"tailscale.com/logger"
)
func RusagePrefixLog(logf func(f string, argv ...interface{})) func(f string, argv ...interface{}) {
func RusagePrefixLog(logf logger.Logf) func(f string, argv ...interface{}) {
return func(f string, argv ...interface{}) {
var m runtime.MemStats
runtime.ReadMemStats(&m)