mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-03 18:57:06 +01:00
Code Issues Projects Releases Wiki Activity

pay: Refactor logging into report_routing_failure.

Browse source
This commit is contained in:
ZmnSCPxj 2018-02-02 23:56:40 +00:00 • committed by Rusty Russell
parent 4ef168cd97
commit d14efde4bc
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lightningd/pay.c
View file

@ -230,18 +230,31 @@ static bool remote_routing_failure(const tal_t *ctx,
return retry_plausible; return retry_plausible;
} }
static void report_routing_failure(struct subd *gossip, static void report_routing_failure(struct log *log,
struct subd *gossip,
struct routing_failure *fail) struct routing_failure *fail)
{ {
u8 *gossip_msg const tal_t *tmpctx = tal_tmpctx(gossip);
= towire_gossip_routing_failure(gossip, u8 *gossip_msg;
assert(fail);
log_debug(log,
"Reporting route failure to gossipd: 0x%04x (%s) "
"node %s channel %s update %s",
fail->failcode, onion_type_name(fail->failcode),
type_to_string(tmpctx, struct pubkey,
&fail->erring_node),
type_to_string(tmpctx, struct short_channel_id,
&fail->erring_channel),
tal_hex(tmpctx, fail->channel_update));
gossip_msg = towire_gossip_routing_failure(tmpctx,
&fail->erring_node, &fail->erring_node,
&fail->erring_channel, &fail->erring_channel,
(u16) fail->failcode, (u16) fail->failcode,
fail->channel_update); fail->channel_update);
subd_send_msg(gossip, gossip_msg); subd_send_msg(gossip, gossip_msg);
tal_free(gossip_msg); tal_free(tmpctx);
} }
void payment_failed(struct lightningd *ld, const struct htlc_out *hout, void payment_failed(struct lightningd *ld, const struct htlc_out *hout,
@ -307,18 +320,8 @@ void payment_failed(struct lightningd *ld, const struct htlc_out *hout,
PAYMENT_FAILED, NULL); PAYMENT_FAILED, NULL);
/* Report to gossipd if there is something we can report. */ /* Report to gossipd if there is something we can report. */
if (fail) { if (fail)
log_debug(ld->log, report_routing_failure(ld->log, ld->gossip, fail);
"Reporting route failure to gossipd: 0x%04x (%s) "
"node %s channel %s update %s",
fail->failcode, onion_type_name(fail->failcode),
type_to_string(tmpctx, struct pubkey,
&fail->erring_node),
type_to_string(tmpctx, struct short_channel_id,
&fail->erring_channel),
tal_hex(tmpctx, fail->channel_update));
report_routing_failure(ld->gossip, fail);
}
/* FIXME(ZmnSCPxj): if retrying is plausible, and we are /* FIXME(ZmnSCPxj): if retrying is plausible, and we are
* using pay command rather than sendpay, retry routing * using pay command rather than sendpay, retry routing