From c8df820e58992cda5fbdfb7f4c41a48cad9c1f2a Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 24 Feb 2017 16:22:56 +1030 Subject: [PATCH] lightning/peer_control: set logging level for peers to match global. That way it's controlled by --log-level= Signed-off-by: Rusty Russell --- daemon/log.c | 5 +++++ daemon/log.h | 1 + lightningd/peer_control.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/daemon/log.c b/daemon/log.c index 564776204..d34ee20ba 100644 --- a/daemon/log.c +++ b/daemon/log.c @@ -127,6 +127,11 @@ new_log(const tal_t *ctx, struct log_book *record, const char *fmt, ...) return log; } +enum log_level get_log_level(struct log_book *lr) +{ + return lr->print_level; +} + void set_log_level(struct log_book *lr, enum log_level level) { lr->print_level = level; diff --git a/daemon/log.h b/daemon/log.h index 6fafda2e4..e56144e61 100644 --- a/daemon/log.h +++ b/daemon/log.h @@ -83,6 +83,7 @@ void PRINTF_FMT(4,5) log_struct_(struct log *log, int level, const char *structname, const char *fmt, ...); +enum log_level get_log_level(struct log_book *lr); void set_log_level(struct log_book *lr, enum log_level level); void set_log_prefix(struct log *log, const char *prefix); const char *log_prefix(const struct log *log); diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c index 34b4cadf3..52cd8a76c 100644 --- a/lightningd/peer_control.c +++ b/lightningd/peer_control.c @@ -56,7 +56,8 @@ static struct peer *new_peer(struct lightningd *ld, peer->fd = io_conn_fd(conn); peer->connect_cmd = cmd; /* Max 128k per peer. */ - peer->log_book = new_log_book(peer, 128*1024, LOG_UNUSUAL); + peer->log_book = new_log_book(peer, 128*1024, + get_log_level(ld->dstate.log_book)); peer->log = new_log(peer, peer->log_book, "peer %"PRIu64":", peer->unique_id);