devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-26 08:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix lint error

Browse source
This commit is contained in:
Kristoffer Dalby 2021-10-29 17:36:11 +00:00
parent 9ef031f0f8
commit 72fd2a2780
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/headscale/cli/utils.go
View file

@ -282,9 +282,11 @@ func getHeadscaleApp() (*headscale.Headscale, error) {
} }
func getHeadscaleGRPCClient() (apiV1.HeadscaleServiceClient, *grpc.ClientConn) { func getHeadscaleGRPCClient() (apiV1.HeadscaleServiceClient, *grpc.ClientConn) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
grpcOptions := []grpc.DialOption{ grpcOptions := []grpc.DialOption{
// TODO(kradalby): Make configurable // TODO(kradalby): Make configurable
grpc.WithTimeout(5 * time.Second),
grpc.WithBlock(), grpc.WithBlock(),
} }
@ -329,7 +331,7 @@ func getHeadscaleGRPCClient() (apiV1.HeadscaleServiceClient, *grpc.ClientConn) {
} }
log.Trace().Caller().Str("address", address).Msg("Connecting via gRPC") log.Trace().Caller().Str("address", address).Msg("Connecting via gRPC")
conn, err := grpc.Dial(address, grpcOptions...) conn, err := grpc.DialContext(ctx, address, grpcOptions...)
if err != nil { if err != nil {
log.Fatal().Err(err).Msgf("Could not connect: %v", err) log.Fatal().Err(err).Msgf("Could not connect: %v", err)
} }