From 8f48a72d748328888ea3fa8de17ecd3d8cbddb97 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 12 Feb 2018 20:43:04 +1030 Subject: [PATCH] lightningd: remove peer->log in favor of channel->log. Signed-off-by: Rusty Russell --- lightningd/channel.c | 6 +++++- lightningd/peer_control.c | 7 +------ lightningd/peer_control.h | 3 --- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lightningd/channel.c b/lightningd/channel.c index e09ba60e9..7e2f30c02 100644 --- a/lightningd/channel.c +++ b/lightningd/channel.c @@ -104,6 +104,7 @@ struct channel *new_channel(struct peer *peer, u64 dbid, u32 first_blocknum) { /* FIXME: We currently rely on it being all zero/NULL */ struct channel *channel = talz(peer->ld, struct channel); + char *idname; channel->dbid = dbid; channel->peer = peer; @@ -112,8 +113,11 @@ struct channel *new_channel(struct peer *peer, u64 dbid, u32 first_blocknum) channel->local_shutdown_idx = -1; /* FIXME: update log prefix when we get scid */ + /* FIXME: Use minimal unique pubkey prefix for logs! */ + idname = type_to_string(peer, struct pubkey, &peer->id); channel->log = new_log(channel, peer->log_book, "%s chan #%"PRIu64":", - log_prefix(peer->log), dbid); + idname, dbid); + tal_free(idname); list_add_tail(&peer->channels, &channel->list); tal_add_destructor(channel, destroy_channel); if (channel->dbid != 0) diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c index 29c38cf2e..8e119a80d 100644 --- a/lightningd/peer_control.c +++ b/lightningd/peer_control.c @@ -106,7 +106,6 @@ struct peer *new_peer(struct lightningd *ld, u64 dbid, { /* We are owned by our channels, and freed manually by destroy_channel */ struct peer *peer = tal(NULL, struct peer); - const char *idname; peer->ld = ld; peer->dbid = dbid; @@ -121,10 +120,6 @@ struct peer *new_peer(struct lightningd *ld, u64 dbid, /* Max 128k per peer. */ peer->log_book = new_log_book(peer, 128*1024, get_log_level(ld->log_book)); - /* FIXME: Use minimal unique pubkey prefix for logs! */ - idname = type_to_string(peer, struct pubkey, id); - peer->log = new_log(peer, peer->log_book, "peer %s:", idname); - tal_free(idname); set_log_outfn(peer->log_book, copy_to_parent_log, peer); list_add_tail(&ld->peers, &peer->list); tal_add_destructor(peer, destroy_peer); @@ -327,7 +322,7 @@ void peer_connected(struct lightningd *ld, const u8 *msg, /* FIXME: Only consider active channels! */ struct channel *channel = peer2channel(peer); - log_debug(peer->log, "Peer has reconnected, state %s", + log_debug(channel->log, "Peer has reconnected, state %s", channel_state_name(channel)); /* FIXME: We can have errors for multiple channels. */ diff --git a/lightningd/peer_control.h b/lightningd/peer_control.h index 989a861d2..c29815bfc 100644 --- a/lightningd/peer_control.h +++ b/lightningd/peer_control.h @@ -37,9 +37,6 @@ struct peer { /* History */ struct log_book *log_book; - /* FIXME: Remove in favor of channel->log */ - struct log *log; - /* Where we connected to, or it connected from. */ struct wireaddr addr;