GlcoinCore/loop
1
0
Fork 0
mirror of https://github.com/lightninglabs/loop.git synced 2026-08-13 12:33:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd/loop: add client conn cleanup

Browse source
This commit is contained in:
Boris Nagaev 2026-02-03 01:54:28 -05:00
parent 3182be8bf1
commit 74c7274b03
No known key found for this signature in database
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmd/loop/debug.go
View file

@ -48,11 +48,10 @@ func getDebugClient(ctx context.Context, cmd *cli.Command) (looprpc.DebugClient,
if err != nil {
return nil, nil, err
}
conn, err := getClientConn(rpcServer, tlsCertPath, macaroonPath)
conn, cleanup, err := getClientConn(rpcServer, tlsCertPath, macaroonPath)
if err != nil {
return nil, nil, err
}
cleanup := func() { conn.Close() }
debugClient := looprpc.NewDebugClient(conn)
return debugClient, cleanup, nil

17
cmd/loop/main.go
View file

@ -251,11 +251,10 @@ func getClientWithConn(cmd *cli.Command) (looprpc.SwapClientClient,
if err != nil {
return nil, nil, nil, err
}
conn, err := getClientConn(rpcServer, tlsCertPath, macaroonPath)
conn, cleanup, err := getClientConn(rpcServer, tlsCertPath, macaroonPath)
if err != nil {
return nil, nil, nil, err
}
cleanup := func() { conn.Close() }
loopClient := looprpc.NewSwapClientClient(conn)
return loopClient, conn, cleanup, nil
@ -465,12 +464,12 @@ func logSwap(swap *looprpc.SwapStatus) {
}
func getClientConn(address, tlsCertPath, macaroonPath string) (*grpc.ClientConn,
error) {
func(), error) {
// We always need to send a macaroon.
macOption, err := readMacaroon(macaroonPath)
if err != nil {
return nil, err
return nil, nil, err
}
opts := []grpc.DialOption{
@ -481,18 +480,22 @@ func getClientConn(address, tlsCertPath, macaroonPath string) (*grpc.ClientConn,
// Since TLS cannot be disabled, we'll always have a cert file to read.
creds, err := credentials.NewClientTLSFromFile(tlsCertPath, "")
if err != nil {
return nil, err
return nil, nil, err
}
opts = append(opts, grpc.WithTransportCredentials(creds))
conn, err := grpc.NewClient(address, opts...)
if err != nil {
return nil, fmt.Errorf("unable to create RPC client: %v",
return nil, nil, fmt.Errorf("unable to create RPC client: %v",
err)
}
return conn, nil
cleanup := func() {
_ = conn.Close()
}
return conn, cleanup, nil
}
// readMacaroon tries to read the macaroon file at the specified path and create