mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 22:45:27 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: add "has_io_logging" helper.

Browse source 
Rather than exposing the filtering internals.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2023-07-17 17:05:22 +09:30
parent c074fe050f
commit 2bf0b922ca
5 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lightningd/log.c
View file

@ -332,7 +332,7 @@ const char *log_prefix(const struct logger *log)
return log->prefix->prefix;
}
enum log_level log_print_level(struct logger *log, const struct node_id *node_id)
static enum log_level log_print_level(struct logger *log, const struct node_id *node_id)
{
if (!log->print_level) {
/* Not set globally yet? Print UNUSUAL / BROKEN messages only */
@ -344,6 +344,10 @@ enum log_level log_print_level(struct logger *log, const struct node_id *node_id
return *log->print_level;
}
bool log_has_io_logging(const struct logger *log)
{
return filter_level(log->log_book, log->prefix, log->default_node_id) < LOG_DBG;
}
/* This may move entry! */
static void add_entry(struct logger *log, struct log_entry **l)

3
lightningd/log.h
View file

@ -44,7 +44,8 @@ void logv(struct logger *logger, enum log_level level, const struct node_id *nod
bool call_notifier, const char *fmt, va_list ap);
const char *log_prefix(const struct logger *logger);
enum log_level log_print_level(struct logger *log, const struct node_id *node_id);
/* Is there any chance we do io-level logging for this node_id in log? */
bool log_has_io_logging(const struct logger *log);
void opt_register_logging(struct lightningd *ld);

2
lightningd/subd.c
View file

@ -742,7 +742,7 @@ static struct subd *new_subd(const tal_t *ctx,
&msg_fd,
/* We only turn on subdaemon io logging if we're going
* to print it: too stressful otherwise! */
log_print_level(sd->log, node_id) < LOG_DBG,
log_has_io_logging(sd->log),
ap);
if (sd->pid == (pid_t)-1) {
log_unusual(ld->log, "subd %s failed: %s",

6
lightningd/test/run-find_my_abspath.c
View file

@ -142,12 +142,12 @@ void log_backtrace_exit(void)
/* Generated stub for log_backtrace_print */
void log_backtrace_print(const char *fmt UNNEEDED, ...)
{ fprintf(stderr, "log_backtrace_print called!\n"); abort(); }
/* Generated stub for log_has_io_logging */
bool log_has_io_logging(const struct logger *log UNNEEDED)
{ fprintf(stderr, "log_has_io_logging called!\n"); abort(); }
/* Generated stub for log_prefix */
const char *log_prefix(const struct logger *logger UNNEEDED)
{ fprintf(stderr, "log_prefix called!\n"); abort(); }
/* Generated stub for log_print_level */
enum log_level log_print_level(struct logger *log UNNEEDED, const struct node_id *node_id UNNEEDED)
{ fprintf(stderr, "log_print_level called!\n"); abort(); }
/* Generated stub for log_status_msg */
bool log_status_msg(struct logger *log UNNEEDED,
const struct node_id *node_id UNNEEDED,

6
lightningd/test/run-shuffle_fds.c
View file

@ -82,12 +82,12 @@ void log_(struct logger *logger UNNEEDED, enum log_level level UNNEEDED,
const char *fmt UNNEEDED, ...)
{ fprintf(stderr, "log_ called!\n"); abort(); }
/* Generated stub for log_has_io_logging */
bool log_has_io_logging(const struct logger *log UNNEEDED)
{ fprintf(stderr, "log_has_io_logging called!\n"); abort(); }
/* Generated stub for log_prefix */
const char *log_prefix(const struct logger *logger UNNEEDED)
{ fprintf(stderr, "log_prefix called!\n"); abort(); }
/* Generated stub for log_print_level */
enum log_level log_print_level(struct logger *log UNNEEDED, const struct node_id *node_id UNNEEDED)
{ fprintf(stderr, "log_print_level called!\n"); abort(); }
/* Generated stub for log_status_msg */
bool log_status_msg(struct logger *log UNNEEDED,
const struct node_id *node_id UNNEEDED,