TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-13 06:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

envknob, health: support Synology, show parse errors in status

Browse Source 
Updates #5114

Change-Id: I8ac7a22a511f5a7d0dcb8cac470d4a403aa8c817
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2022-09-16 20:24:28 -07:00
committed by Brad Fitzpatrick
parent 5c42990c2f
commit 3562b5bdfa
5 changed files with 66 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/tailscaled/tailscaled.go
View File

@@ -131,11 +131,9 @@ var subCommands = map[string]*func([]string) error{
var beCLI func() // non-nil if CLI is linked in
var diskConfigErr error
func main() {
envknob.PanicIfAnyEnvCheckedInInit()
diskConfigErr = envknob.ApplyDiskConfig()
envknob.ApplyDiskConfig()
printVersion := false
flag.IntVar(&args.verbose, "verbose", 0, "log verbosity level; 0 is default, 1 or higher are increasingly verbose")
@@ -313,8 +311,8 @@ func run() error {
pol.Shutdown(ctx)
}()
if diskConfigErr != nil {
log.Printf("Error reading environment config: %v", diskConfigErr)
if err := envknob.ApplyDiskConfigError(); err != nil {
log.Printf("Error reading environment config: %v", err)
}
if isWindowsService() {

4
cmd/tailscaled/tailscaled_windows.go
View File

@@ -197,8 +197,8 @@ func beWindowsSubprocess() bool {
log.Printf("Program starting: v%v: %#v", version.Long, os.Args)
log.Printf("subproc mode: logid=%v", logid)
if diskConfigErr != nil {
log.Printf("Error reading environment config: %v", diskConfigErr)
if err := envknob.ApplyDiskConfigError(); err != nil {
log.Printf("Error reading environment config: %v", err)
}
go func() {