aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

channel: don't log scary disconnect message on unowned channels.

Browse Source 
We always call channel_fail_transient() on all channels when a peer
connects, to clean up any previous connections.  However, when
we startup, this channel doesn't have an owner yet, resulting in
a fairly weird INFO level message.

Reported-by: Michael Schmook @mschmook
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: `lightningd`: don't log gratuitous "Peer transient failure" message on first connection after restart.
This commit is contained in:
Rusty Russell
2023-04-03 14:19:05 +09:30
parent 00431779a6
commit 64d3f3be26
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lightningd/channel.c
View File

@@ -963,6 +963,10 @@ void channel_set_billboard(struct channel *channel, bool perm, const char *str)
static void channel_err(struct channel *channel, const char *why) static void channel_err(struct channel *channel, const char *why)
{ {
/* Nothing to do if channel isn't actually owned! */
if (!channel->owner)
return;
log_info(channel->log, "Peer transient failure in %s: %s", log_info(channel->log, "Peer transient failure in %s: %s",
channel_state_name(channel), why); channel_state_name(channel), why);

1
tests/test_connection.py
View File

@@ -4379,7 +4379,6 @@ def test_peer_disconnected_reflected_in_channel_state(node_factory):
wait_for(lambda: only_one(l1.rpc.listpeerchannels(l2.info['id'])['channels'])['peer_connected'] is False) wait_for(lambda: only_one(l1.rpc.listpeerchannels(l2.info['id'])['channels'])['peer_connected'] is False)
@pytest.mark.xfail(strict=True)
@pytest.mark.developer("needs dev-no-reconnect") @pytest.mark.developer("needs dev-no-reconnect")
def test_reconnect_no_additional_transient_failure(node_factory, bitcoind): def test_reconnect_no_additional_transient_failure(node_factory, bitcoind):
l1, l2 = node_factory.line_graph(2, opts=[{'may_reconnect': True}, l1, l2 = node_factory.line_graph(2, opts=[{'may_reconnect': True},