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

Move "logger" package to under types, now that we have it.

Browse Source 
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2020-02-14 19:23:16 -08:00 committed by Brad Fitzpatrick
parent dec5d64593
commit 2896be60db
19 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control/controlclient/auto.go
View File

@ -18,10 +18,10 @@
"time" "time"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"tailscale.com/logger"
"tailscale.com/logtail/backoff" "tailscale.com/logtail/backoff"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/types/empty" "tailscale.com/types/empty"
"tailscale.com/types/logger"
) )
// TODO(apenwarr): eliminate the 'state' variable, as it's now obsolete. // TODO(apenwarr): eliminate the 'state' variable, as it's now obsolete.

2
control/controlclient/direct.go
View File

@ -25,8 +25,8 @@
"github.com/tailscale/wireguard-go/wgcfg" "github.com/tailscale/wireguard-go/wgcfg"
"golang.org/x/crypto/nacl/box" "golang.org/x/crypto/nacl/box"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"tailscale.com/logger"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/types/logger"
"tailscale.com/version" "tailscale.com/version"
"tailscale.com/wgengine/filter" "tailscale.com/wgengine/filter"
) )

2
derp/derp_client.go
View File

@ -15,7 +15,7 @@
"golang.org/x/crypto/curve25519" "golang.org/x/crypto/curve25519"
"golang.org/x/crypto/nacl/box" "golang.org/x/crypto/nacl/box"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
type Client struct { type Client struct {

2
derp/derp_server.go
View File

@ -23,7 +23,7 @@
"golang.org/x/crypto/curve25519" "golang.org/x/crypto/curve25519"
"golang.org/x/crypto/nacl/box" "golang.org/x/crypto/nacl/box"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
const magic = 0x44c55250 // "DERP" with a non-ASCII high-bit const magic = 0x44c55250 // "DERP" with a non-ASCII high-bit

2
derp/derphttp/derphttp_client.go
View File

@ -23,7 +23,7 @@
"sync" "sync"
"tailscale.com/derp" "tailscale.com/derp"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
// Client is a DERP-over-HTTP client. // Client is a DERP-over-HTTP client.

2
ipn/handle.go
View File

@ -10,7 +10,7 @@
"time" "time"
"github.com/tailscale/wireguard-go/wgcfg" "github.com/tailscale/wireguard-go/wgcfg"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
type Handle struct { type Handle struct {

2
ipn/ipnserver/server.go
View File

@ -22,9 +22,9 @@
"github.com/klauspost/compress/zstd" "github.com/klauspost/compress/zstd"
"tailscale.com/control/controlclient" "tailscale.com/control/controlclient"
"tailscale.com/ipn" "tailscale.com/ipn"
"tailscale.com/logger"
"tailscale.com/logtail/backoff" "tailscale.com/logtail/backoff"
"tailscale.com/safesocket" "tailscale.com/safesocket"
"tailscale.com/types/logger"
"tailscale.com/wgengine" "tailscale.com/wgengine"
) )

2
ipn/local.go
View File

@ -14,10 +14,10 @@
"github.com/tailscale/wireguard-go/wgcfg" "github.com/tailscale/wireguard-go/wgcfg"
"tailscale.com/control/controlclient" "tailscale.com/control/controlclient"
"tailscale.com/logger"
"tailscale.com/portlist" "tailscale.com/portlist"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/types/empty" "tailscale.com/types/empty"
"tailscale.com/types/logger"
"tailscale.com/version" "tailscale.com/version"
"tailscale.com/wgengine" "tailscale.com/wgengine"
"tailscale.com/wgengine/filter" "tailscale.com/wgengine/filter"

2
ipn/message.go
View File

@ -13,7 +13,7 @@
"log" "log"
"time" "time"
"tailscale.com/logger" "tailscale.com/types/logger"
"tailscale.com/version" "tailscale.com/version"
) )

0
logger/logger.go → types/logger/logger.go
View File

2
wgengine/monitor/monitor.go
View File

@ -9,7 +9,7 @@
import ( import (
"time" "time"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
// Message represents a message returned from a connection. // Message represents a message returned from a connection.

2
wgengine/router_bsd.go
View File

@ -15,7 +15,7 @@
"github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/tun"
"github.com/tailscale/wireguard-go/wgcfg" "github.com/tailscale/wireguard-go/wgcfg"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
// For now this router only supports the userspace WireGuard implementations. // For now this router only supports the userspace WireGuard implementations.

2
wgengine/router_darwin.go
View File

@ -7,7 +7,7 @@
import ( import (
"github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/tun"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
type darwinRouter struct { type darwinRouter struct {

2
wgengine/router_default.go
View File

@ -9,7 +9,7 @@
import ( import (
"github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/tun"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
func NewUserspaceRouter(logf logger.Logf, tunname string, dev *device.Device, tuntap tun.Device, netChanged func()) Router { func NewUserspaceRouter(logf logger.Logf, tunname string, dev *device.Device, tuntap tun.Device, netChanged func()) Router {

2
wgengine/router_fake.go
View File

@ -7,7 +7,7 @@
import ( import (
"github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/tun"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
type fakeRouter struct { type fakeRouter struct {

2
wgengine/router_linux.go
View File

@ -19,7 +19,7 @@
"github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/tun"
"github.com/tailscale/wireguard-go/wgcfg" "github.com/tailscale/wireguard-go/wgcfg"
"tailscale.com/atomicfile" "tailscale.com/atomicfile"
"tailscale.com/logger" "tailscale.com/types/logger"
"tailscale.com/wgengine/monitor" "tailscale.com/wgengine/monitor"
) )

2
wgengine/router_windows.go
View File

@ -10,7 +10,7 @@
winipcfg "github.com/tailscale/winipcfg-go" winipcfg "github.com/tailscale/winipcfg-go"
"github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/tun"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
type winRouter struct { type winRouter struct {

2
wgengine/rusage.go
View File

@ -8,7 +8,7 @@
"fmt" "fmt"
"runtime" "runtime"
"tailscale.com/logger" "tailscale.com/types/logger"
) )
// RusagePrefixLog returns a Logf func wrapping the provided logf func that adds // RusagePrefixLog returns a Logf func wrapping the provided logf func that adds

2
wgengine/userspace.go
View File

@ -16,8 +16,8 @@
"github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/tun"
"github.com/tailscale/wireguard-go/wgcfg" "github.com/tailscale/wireguard-go/wgcfg"
"tailscale.com/logger"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/types/logger"
"tailscale.com/wgengine/filter" "tailscale.com/wgengine/filter"
"tailscale.com/wgengine/magicsock" "tailscale.com/wgengine/magicsock"
"tailscale.com/wgengine/packet" "tailscale.com/wgengine/packet"