lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log{policy,tail}: set the target correctly 

Signed-off-by: Christine Dodrill <xe@tailscale.com>
pull/1243/head
Christine Dodrill 2021-02-03 12:25:24 -05:00
parent 187fc6f1c5
commit 305ae4d8ad
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
logpolicy/logpolicy.go
View File

@ -17,6 +17,7 @@ import (
"log" "log"
"net" "net"
"net/http" "net/http"
"net/url"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -390,6 +391,8 @@ func New(collection string) *Policy {
if val, ok := os.LookupEnv("TAILSCALE_LOG_TARGET_DO_NOT_SET_UNLESS_TOLD_TO"); ok { if val, ok := os.LookupEnv("TAILSCALE_LOG_TARGET_DO_NOT_SET_UNLESS_TOLD_TO"); ok {
log.Println("You have enabled a non-default log target. Doing without being told to by Tailscale staff or your network administrator will make getting support difficult.") log.Println("You have enabled a non-default log target. Doing without being told to by Tailscale staff or your network administrator will make getting support difficult.")
c.BaseURL = val c.BaseURL = val
u, _ := url.Parse(val)
c.HTTPC = &http.Client{Transport: newLogtailTransport(u.Host)}
} }
filchBuf, filchErr := filch.New(filepath.Join(dir, cmdName), filch.Options{}) filchBuf, filchErr := filch.New(filepath.Join(dir, cmdName), filch.Options{})

2
logtail/logtail.go
View File

@ -12,6 +12,7 @@ import (
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"log"
"net/http" "net/http"
"os" "os"
"strconv" "strconv"
@ -51,6 +52,7 @@ type Config struct {
func NewLogger(cfg Config, logf tslogger.Logf) *Logger { func NewLogger(cfg Config, logf tslogger.Logf) *Logger {
if cfg.BaseURL == "" { if cfg.BaseURL == "" {
cfg.BaseURL = "https://" + DefaultHost cfg.BaseURL = "https://" + DefaultHost
log.Println("XXX(Xe): set default host")
} }
if cfg.HTTPC == nil { if cfg.HTTPC == nil {
cfg.HTTPC = http.DefaultClient cfg.HTTPC = http.DefaultClient