From b124478cafae4f75c433c704089f0d381ba920f1 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Fri, 8 Jul 2022 22:13:33 +0200
Subject: [PATCH] cancel context

---
 channelAcceptor.go | 1 -
 htlcInterceptor.go | 3 +++
 main.go            | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/channelAcceptor.go b/channelAcceptor.go
index 5afdbb0..819087e 100644
--- a/channelAcceptor.go
+++ b/channelAcceptor.go
@@ -13,7 +13,6 @@ import (
 
 func (app *app) dispatchChannelAcceptor(ctx context.Context) {
 	client := app.client
-
 	// wait group for channel acceptor
 	defer ctx.Value(ctxKeyWaitGroup).(*sync.WaitGroup).Done()
 	// get the lnd grpc connection
diff --git a/htlcInterceptor.go b/htlcInterceptor.go
index 327583f..774e280 100644
--- a/htlcInterceptor.go
+++ b/htlcInterceptor.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"strconv"
+	"sync"
 	"time"
 
 	"github.com/lightningnetwork/lnd/lnrpc"
@@ -14,6 +15,8 @@ import (
 )
 
 func (app *app) dispatchHTLCAcceptor(ctx context.Context) {
+	// wait group for channel acceptor
+	defer ctx.Value(ctxKeyWaitGroup).(*sync.WaitGroup).Done()
 	conn := app.conn
 	router := routerrpc.NewRouterClient(conn)
 
diff --git a/main.go b/main.go
index 449e42a..9dc59d6 100644
--- a/main.go
+++ b/main.go
@@ -49,6 +49,7 @@ func getClientConnection(ctx context.Context) (*grpc.ClientConn, error) {
 		grpc.WithBlock(),
 		grpc.WithPerRPCCredentials(cred),
 	}
+	log.Infof("Connecting to LND...")
 	conn, err := grpc.DialContext(ctx, Configuration.Host, opts...)
 	if err != nil {
 		return nil, err
@@ -75,12 +76,12 @@ func main() {
 		app.myPubkey, err = app.getMyPubkey(ctx)
 		if err != nil {
 			log.Errorf("Could not get my pubkey: %s", err)
-			return
+			continue
 		}
 
 		var wg sync.WaitGroup
 		ctx = context.WithValue(ctx, ctxKeyWaitGroup, &wg)
-		wg.Add(1)
+		wg.Add(2)
 
 		// channel acceptor
 		go app.dispatchChannelAcceptor(ctx)