diff --git a/forwarding_history.go b/forwarding_history.go index d511ba5..56c566d 100644 --- a/forwarding_history.go +++ b/forwarding_history.go @@ -44,7 +44,7 @@ func channelsSynchronize(client *LndClient) { if err != nil { log.Printf("chainNotifierClient.RegisterBlockEpochNtfn(): %v", err) cancel() - time.Sleep(1 * time.Second) + <-time.After(time.Second) continue } @@ -52,10 +52,11 @@ func channelsSynchronize(client *LndClient) { _, err := stream.Recv() if err != nil { log.Printf("stream.Recv: %v", err) + <-time.After(time.Second) break } if lastSync.Add(5 * time.Minute).Before(time.Now()) { - time.Sleep(30 * time.Second) + <-time.After(30 * time.Second) err = channelsSynchronizeOnce(client) lastSync = time.Now() log.Printf("channelsSynchronizeOnce() err: %v", err) @@ -102,7 +103,7 @@ func forwardingHistorySynchronize(client *LndClient) { for { err := forwardingHistorySynchronizeOnce(client) log.Printf("forwardingHistorySynchronizeOnce() err: %v", err) - time.Sleep(1 * time.Minute) + <-time.After(1 * time.Minute) } } diff --git a/intercept.go b/intercept.go index a7a8fff..ed04a45 100644 --- a/intercept.go +++ b/intercept.go @@ -198,7 +198,7 @@ func intercept(reqPaymentHash []byte, reqOutgoingAmountMsat uint64, reqOutgoingE log.Printf("Stop retrying getChannel(%v, %v)", destination, channelPoint.String()) break } - time.Sleep(1 * time.Second) + <-time.After(1 * time.Second) } log.Printf("Error: Channel failed to opened... timed out. ") diff --git a/itest/postgres.go b/itest/postgres.go index 1d4fbfd..bc3a89d 100644 --- a/itest/postgres.go +++ b/itest/postgres.go @@ -107,10 +107,10 @@ HealthCheck: break HealthCheck } - time.Sleep(50 * time.Millisecond) + <-time.After(50 * time.Millisecond) } default: - time.Sleep(200 * time.Millisecond) + <-time.After(200 * time.Millisecond) } } diff --git a/lnd_interceptor.go b/lnd_interceptor.go index ed43d82..4c13c8b 100644 --- a/lnd_interceptor.go +++ b/lnd_interceptor.go @@ -58,12 +58,13 @@ func (i *LndHtlcInterceptor) intercept() error { return nil } + log.Printf("Connecting LND HTLC interceptor.") cancellableCtx, cancel := context.WithCancel(context.Background()) interceptorClient, err := i.client.routerClient.HtlcInterceptor(cancellableCtx) if err != nil { log.Printf("routerClient.HtlcInterceptor(): %v", err) cancel() - time.Sleep(1 * time.Second) + <-time.After(time.Second) continue } @@ -133,6 +134,7 @@ func (i *LndHtlcInterceptor) intercept() error { } cancel() + <-time.After(time.Second) } } diff --git a/main.go b/main.go index a181e51..e447194 100644 --- a/main.go +++ b/main.go @@ -65,6 +65,8 @@ func main() { if err != nil { log.Fatalf("client.GetInfo() error: %v", err) } + log.Printf("Connected to node '%s', alias '%s'", info.Pubkey, info.Alias) + if nodeName == "" { nodeName = info.Alias }