fix(tsnet): add timeout handling for tsnet server initialization
This commit is contained in:
+4
-1
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
fmt2 "fmt"
|
||||
"log/slog"
|
||||
"time"
|
||||
|
||||
"tailscale.com/ipn"
|
||||
|
||||
@@ -40,7 +41,9 @@ func InitTsNet(ctx context.Context, cfg *Core, logger *slog.Logger, withDebugLog
|
||||
return nil, err
|
||||
}
|
||||
|
||||
status, err := srv.Up(ctx)
|
||||
cnclCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
|
||||
defer cancel()
|
||||
status, err := srv.Up(cnclCtx)
|
||||
if err != nil {
|
||||
logger.With(slog.String("error", err.Error())).Error("bring up tsnet server failed")
|
||||
return nil, err
|
||||
|
||||
@@ -2,6 +2,7 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"flag"
|
||||
"log/slog"
|
||||
"os"
|
||||
@@ -21,9 +22,14 @@ func serviceLogic(configPath string, isTsnetDebug bool, logger *slog.Logger) boo
|
||||
}
|
||||
|
||||
ctx, cancelAll := context.WithCancel(context.Background())
|
||||
defer cancelAll()
|
||||
logger.Info("initializing tsnet server")
|
||||
srv, err := core.InitTsNet(ctx, &cfg.Core, logger, isTsnetDebug)
|
||||
if err != nil {
|
||||
if errors.Is(err, context.DeadlineExceeded) {
|
||||
logger.Debug("tsnet initialization timed out, retrying")
|
||||
return false
|
||||
}
|
||||
logger.With(
|
||||
slog.String("error", err.Error())).Error("Error initializing tsnet")
|
||||
os.Exit(1)
|
||||
|
||||
Reference in New Issue
Block a user