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

lightningd/peer_control: join peer logs with master logs.

Browse source 
We use --log-level to control this, but we could add another switch.

It makes the test infrastructure simpler, since we can just look in the
main logs.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-06-06 12:38:42 +09:30
parent f7a22b699e
commit 87ef7acbd6
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lightningd/peer_control.c
View file

@ -270,6 +270,21 @@ static bool peer_reconnected(struct lightningd *ld,
abort(); abort();
} }
/* We copy per-peer entries above --log-level into the main log. */
static void copy_to_parent_log(const char *prefix,
enum log_level level,
bool continued,
const char *str,
struct peer *peer)
{
const char *idstr = type_to_string(peer, struct pubkey, &peer->id);
if (continued)
log_add(peer->ld->log, "peer %s: ... %s", idstr, str);
else
log_(peer->ld->log, level, "peer %s: %s", idstr, str);
tal_free(idstr);
}
void add_peer(struct lightningd *ld, u64 unique_id, void add_peer(struct lightningd *ld, u64 unique_id,
int fd, const struct pubkey *id, int fd, const struct pubkey *id,
const struct crypto_state *cs) const struct crypto_state *cs)
@ -304,6 +319,7 @@ void add_peer(struct lightningd *ld, u64 unique_id,
peer->log_book = new_log_book(peer, 128*1024, peer->log_book = new_log_book(peer, 128*1024,
get_log_level(ld->dstate.log_book)); get_log_level(ld->dstate.log_book));
peer->log = new_log(peer, peer->log_book, "peer %s:", idname); peer->log = new_log(peer, peer->log_book, "peer %s:", idname);
set_log_outfn(peer->log_book, copy_to_parent_log, peer);
/* FIXME: Don't assume protocol here! */ /* FIXME: Don't assume protocol here! */
if (!netaddr_from_fd(peer->fd, SOCK_STREAM, IPPROTO_TCP, if (!netaddr_from_fd(peer->fd, SOCK_STREAM, IPPROTO_TCP,