myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Move context per cure's suggestion

Browse source
This commit is contained in:
Kristoffer Dalby 2021-10-31 16:26:51 +00:00
parent 3f30bf1e33
commit 12f2a7cee0
No known key found for this signature in database
GPG key ID: 09F62DC067465735
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/headscale/cli/namespaces.go
View file

@ -38,14 +38,14 @@ var createNamespaceCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
o, _ := cmd.Flags().GetString("output") o, _ := cmd.Flags().GetString("output")
client, conn := getHeadscaleGRPCClient() ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
client, conn := getHeadscaleGRPCClient(ctx)
defer conn.Close() defer conn.Close()
log.Trace().Interface("client", client).Msg("Obtained gRPC client") log.Trace().Interface("client", client).Msg("Obtained gRPC client")
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
defer cancel()
request := &apiV1.CreateNamespaceRequest{Name: args[0]} request := &apiV1.CreateNamespaceRequest{Name: args[0]}
log.Trace().Interface("request", request).Msg("Sending CreateNamespace request") log.Trace().Interface("request", request).Msg("Sending CreateNamespace request")

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

@ -316,11 +316,7 @@ func getHeadscaleApp() (*headscale.Headscale, error) {
return h, nil return h, nil
} }
func getHeadscaleGRPCClient() (apiV1.HeadscaleServiceClient, *grpc.ClientConn) { func getHeadscaleGRPCClient(ctx context.Context) (apiV1.HeadscaleServiceClient, *grpc.ClientConn) {
// TODO(kradalby): Make configurable
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
grpcOptions := []grpc.DialOption{ grpcOptions := []grpc.DialOption{
grpc.WithBlock(), grpc.WithBlock(),
} }