From 2896be60db29f1716d002d403c98005764d8e2ad Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 14 Feb 2020 19:23:16 -0800 Subject: [PATCH] Move "logger" package to under types, now that we have it. Signed-off-by: Brad Fitzpatrick --- control/controlclient/auto.go | 2 +- control/controlclient/direct.go | 2 +- derp/derp_client.go | 2 +- derp/derp_server.go | 2 +- derp/derphttp/derphttp_client.go | 2 +- ipn/handle.go | 2 +- ipn/ipnserver/server.go | 2 +- ipn/local.go | 2 +- ipn/message.go | 2 +- {logger => types/logger}/logger.go | 0 wgengine/monitor/monitor.go | 2 +- wgengine/router_bsd.go | 2 +- wgengine/router_darwin.go | 2 +- wgengine/router_default.go | 2 +- wgengine/router_fake.go | 2 +- wgengine/router_linux.go | 2 +- wgengine/router_windows.go | 2 +- wgengine/rusage.go | 2 +- wgengine/userspace.go | 2 +- 19 files changed, 18 insertions(+), 18 deletions(-) rename {logger => types/logger}/logger.go (100%) diff --git a/control/controlclient/auto.go b/control/controlclient/auto.go index 54ff7d77c..1ae3946e2 100644 --- a/control/controlclient/auto.go +++ b/control/controlclient/auto.go @@ -18,10 +18,10 @@ import ( "time" "golang.org/x/oauth2" - "tailscale.com/logger" "tailscale.com/logtail/backoff" "tailscale.com/tailcfg" "tailscale.com/types/empty" + "tailscale.com/types/logger" ) // TODO(apenwarr): eliminate the 'state' variable, as it's now obsolete. diff --git a/control/controlclient/direct.go b/control/controlclient/direct.go index c22787a0b..9c1cd1ff6 100644 --- a/control/controlclient/direct.go +++ b/control/controlclient/direct.go @@ -25,8 +25,8 @@ import ( "github.com/tailscale/wireguard-go/wgcfg" "golang.org/x/crypto/nacl/box" "golang.org/x/oauth2" - "tailscale.com/logger" "tailscale.com/tailcfg" + "tailscale.com/types/logger" "tailscale.com/version" "tailscale.com/wgengine/filter" ) diff --git a/derp/derp_client.go b/derp/derp_client.go index d771d2203..fef5120f4 100644 --- a/derp/derp_client.go +++ b/derp/derp_client.go @@ -15,7 +15,7 @@ import ( "golang.org/x/crypto/curve25519" "golang.org/x/crypto/nacl/box" - "tailscale.com/logger" + "tailscale.com/types/logger" ) type Client struct { diff --git a/derp/derp_server.go b/derp/derp_server.go index d054ea0bc..01688e778 100644 --- a/derp/derp_server.go +++ b/derp/derp_server.go @@ -23,7 +23,7 @@ import ( "golang.org/x/crypto/curve25519" "golang.org/x/crypto/nacl/box" - "tailscale.com/logger" + "tailscale.com/types/logger" ) const magic = 0x44c55250 // "DERP" with a non-ASCII high-bit diff --git a/derp/derphttp/derphttp_client.go b/derp/derphttp/derphttp_client.go index 30ee51015..fe696be7f 100644 --- a/derp/derphttp/derphttp_client.go +++ b/derp/derphttp/derphttp_client.go @@ -23,7 +23,7 @@ import ( "sync" "tailscale.com/derp" - "tailscale.com/logger" + "tailscale.com/types/logger" ) // Client is a DERP-over-HTTP client. diff --git a/ipn/handle.go b/ipn/handle.go index 8b4794daa..bd351f8be 100644 --- a/ipn/handle.go +++ b/ipn/handle.go @@ -10,7 +10,7 @@ import ( "time" "github.com/tailscale/wireguard-go/wgcfg" - "tailscale.com/logger" + "tailscale.com/types/logger" ) type Handle struct { diff --git a/ipn/ipnserver/server.go b/ipn/ipnserver/server.go index 9d2964d85..e913ed239 100644 --- a/ipn/ipnserver/server.go +++ b/ipn/ipnserver/server.go @@ -22,9 +22,9 @@ import ( "github.com/klauspost/compress/zstd" "tailscale.com/control/controlclient" "tailscale.com/ipn" - "tailscale.com/logger" "tailscale.com/logtail/backoff" "tailscale.com/safesocket" + "tailscale.com/types/logger" "tailscale.com/wgengine" ) diff --git a/ipn/local.go b/ipn/local.go index 81ad20c43..d1ffee31a 100644 --- a/ipn/local.go +++ b/ipn/local.go @@ -14,10 +14,10 @@ import ( "github.com/tailscale/wireguard-go/wgcfg" "tailscale.com/control/controlclient" - "tailscale.com/logger" "tailscale.com/portlist" "tailscale.com/tailcfg" "tailscale.com/types/empty" + "tailscale.com/types/logger" "tailscale.com/version" "tailscale.com/wgengine" "tailscale.com/wgengine/filter" diff --git a/ipn/message.go b/ipn/message.go index e75599dbe..48f8e0dbb 100644 --- a/ipn/message.go +++ b/ipn/message.go @@ -13,7 +13,7 @@ import ( "log" "time" - "tailscale.com/logger" + "tailscale.com/types/logger" "tailscale.com/version" ) diff --git a/logger/logger.go b/types/logger/logger.go similarity index 100% rename from logger/logger.go rename to types/logger/logger.go diff --git a/wgengine/monitor/monitor.go b/wgengine/monitor/monitor.go index b451f76e2..96967e5a6 100644 --- a/wgengine/monitor/monitor.go +++ b/wgengine/monitor/monitor.go @@ -9,7 +9,7 @@ package monitor import ( "time" - "tailscale.com/logger" + "tailscale.com/types/logger" ) // Message represents a message returned from a connection. diff --git a/wgengine/router_bsd.go b/wgengine/router_bsd.go index 74dc1138a..435a3d576 100644 --- a/wgengine/router_bsd.go +++ b/wgengine/router_bsd.go @@ -15,7 +15,7 @@ import ( "github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/wgcfg" - "tailscale.com/logger" + "tailscale.com/types/logger" ) // For now this router only supports the userspace WireGuard implementations. diff --git a/wgengine/router_darwin.go b/wgengine/router_darwin.go index 0c17f28b1..bd6b4345a 100644 --- a/wgengine/router_darwin.go +++ b/wgengine/router_darwin.go @@ -7,7 +7,7 @@ package wgengine import ( "github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/tun" - "tailscale.com/logger" + "tailscale.com/types/logger" ) type darwinRouter struct { diff --git a/wgengine/router_default.go b/wgengine/router_default.go index 34eacfc12..c6577b503 100644 --- a/wgengine/router_default.go +++ b/wgengine/router_default.go @@ -9,7 +9,7 @@ package wgengine import ( "github.com/tailscale/wireguard-go/device" "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 { diff --git a/wgengine/router_fake.go b/wgengine/router_fake.go index e6227e977..339753f45 100644 --- a/wgengine/router_fake.go +++ b/wgengine/router_fake.go @@ -7,7 +7,7 @@ package wgengine import ( "github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/tun" - "tailscale.com/logger" + "tailscale.com/types/logger" ) type fakeRouter struct { diff --git a/wgengine/router_linux.go b/wgengine/router_linux.go index 108487260..2b2376af2 100644 --- a/wgengine/router_linux.go +++ b/wgengine/router_linux.go @@ -19,7 +19,7 @@ import ( "github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/wgcfg" "tailscale.com/atomicfile" - "tailscale.com/logger" + "tailscale.com/types/logger" "tailscale.com/wgengine/monitor" ) diff --git a/wgengine/router_windows.go b/wgengine/router_windows.go index 7e04d823e..69bd5b781 100644 --- a/wgengine/router_windows.go +++ b/wgengine/router_windows.go @@ -10,7 +10,7 @@ import ( winipcfg "github.com/tailscale/winipcfg-go" "github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/tun" - "tailscale.com/logger" + "tailscale.com/types/logger" ) type winRouter struct { diff --git a/wgengine/rusage.go b/wgengine/rusage.go index 698f9ebf4..b39667f6f 100644 --- a/wgengine/rusage.go +++ b/wgengine/rusage.go @@ -8,7 +8,7 @@ import ( "fmt" "runtime" - "tailscale.com/logger" + "tailscale.com/types/logger" ) // RusagePrefixLog returns a Logf func wrapping the provided logf func that adds diff --git a/wgengine/userspace.go b/wgengine/userspace.go index d6632c202..d1de72a42 100644 --- a/wgengine/userspace.go +++ b/wgengine/userspace.go @@ -16,8 +16,8 @@ import ( "github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/tun" "github.com/tailscale/wireguard-go/wgcfg" - "tailscale.com/logger" "tailscale.com/tailcfg" + "tailscale.com/types/logger" "tailscale.com/wgengine/filter" "tailscale.com/wgengine/magicsock" "tailscale.com/wgengine/packet"