|
|
|
@ -5,6 +5,7 @@ import (
|
|
|
|
|
"os"
|
|
|
|
|
"os/signal"
|
|
|
|
|
"sync"
|
|
|
|
|
"time"
|
|
|
|
|
|
|
|
|
|
"github.com/edouardparis/lntop/app"
|
|
|
|
|
"github.com/edouardparis/lntop/events"
|
|
|
|
@ -33,33 +34,35 @@ func (p *pubSub) invoices(ctx context.Context, sub chan *events.Event) {
|
|
|
|
|
p.wg.Add(2)
|
|
|
|
|
invoices := make(chan *models.Invoice)
|
|
|
|
|
|
|
|
|
|
go func() {
|
|
|
|
|
for invoice := range invoices {
|
|
|
|
|
p.logger.Debug("receive invoice", logging.Object("invoice", invoice))
|
|
|
|
|
if invoice.Settled {
|
|
|
|
|
sub <- events.New(events.InvoiceSettled)
|
|
|
|
|
} else {
|
|
|
|
|
sub <- events.New(events.InvoiceCreated)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
p.wg.Done()
|
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
go func() {
|
|
|
|
|
for {
|
|
|
|
|
select {
|
|
|
|
|
case <-p.stop:
|
|
|
|
|
p.logger.Info("stop invoices")
|
|
|
|
|
close(invoices)
|
|
|
|
|
p.logger.Info("close invoices")
|
|
|
|
|
p.wg.Done()
|
|
|
|
|
return
|
|
|
|
|
default:
|
|
|
|
|
invoice := <-invoices
|
|
|
|
|
p.logger.Debug("receive invoice", logging.Object("invoice", invoice))
|
|
|
|
|
if invoice.Settled {
|
|
|
|
|
sub <- events.New(events.InvoiceSettled)
|
|
|
|
|
} else {
|
|
|
|
|
sub <- events.New(events.InvoiceCreated)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
go func() {
|
|
|
|
|
select {
|
|
|
|
|
case <-p.stop:
|
|
|
|
|
p.wg.Done()
|
|
|
|
|
return
|
|
|
|
|
default:
|
|
|
|
|
err := p.network.SubscribeInvoice(ctx, invoices)
|
|
|
|
|
if err != nil {
|
|
|
|
|
p.logger.Error("SubscribeInvoice returned an error", logging.Error(err))
|
|
|
|
|
time.Sleep(3 * time.Second)
|
|
|
|
|
p.logger.Info("loop")
|
|
|
|
|
//err := p.network.SubscribeInvoice(ctx, invoices)
|
|
|
|
|
//if err != nil {
|
|
|
|
|
//
|
|
|
|
|
//p.logger.Error("SubscribeInvoice returned an error", logging.Error(err))
|
|
|
|
|
//}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}()
|
|
|
|
@ -70,11 +73,11 @@ func (p *pubSub) wait() {
|
|
|
|
|
signal.Notify(c, os.Interrupt)
|
|
|
|
|
p.wg.Add(1)
|
|
|
|
|
go func() {
|
|
|
|
|
for sig := range c {
|
|
|
|
|
p.logger.Debug("Received signal, gracefully stopping", logging.String("sig", sig.String()))
|
|
|
|
|
p.wg.Done()
|
|
|
|
|
close(p.stop)
|
|
|
|
|
}
|
|
|
|
|
sig := <-c
|
|
|
|
|
p.logger.Debug("Received signal, gracefully stopping", logging.String("sig", sig.String()))
|
|
|
|
|
p.stop <- true
|
|
|
|
|
close(p.stop)
|
|
|
|
|
p.wg.Done()
|
|
|
|
|
}()
|
|
|
|
|
p.wg.Wait()
|
|
|
|
|
}
|
|
|
|
|