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

common: log when we toggle IO logging, don't edit env in tests!

Browse Source 
Tests were failing when in the same thread after a test which set
log_all_io=True, because SIGUSR1 seemed to be turning logging *off*.

This is due to Python using references not copies for assignment.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-08-17 13:46:34 +09:30
committed by Christian Decker
parent 9f044305db
commit 4c891f4661
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/status.c
View File

@@ -17,6 +17,7 @@
static int status_fd = -1; static int status_fd = -1;
static struct daemon_conn *status_conn; static struct daemon_conn *status_conn;
volatile bool logging_io = false; volatile bool logging_io = false;
static bool was_logging_io = false;
static void got_sigusr1(int signal UNUSED) static void got_sigusr1(int signal UNUSED)
{ {
@@ -34,31 +35,43 @@ static void setup_logging_sighandler(void)
sigaction(SIGUSR1, &act, NULL); sigaction(SIGUSR1, &act, NULL);
} }
static void report_logging_io(const char *why)
{
if (logging_io != was_logging_io) {
was_logging_io = logging_io;
status_trace("%s: IO LOGGING %s",
why, logging_io ? "ENABLED" : "DISABLED");
}
}
void status_setup_sync(int fd) void status_setup_sync(int fd)
{ {
#if DEVELOPER
logging_io = (getenv("LIGHTNINGD_DEV_LOG_IO") != NULL);
#endif
assert(status_fd == -1); assert(status_fd == -1);
assert(!status_conn); assert(!status_conn);
status_fd = fd; status_fd = fd;
setup_logging_sighandler(); setup_logging_sighandler();
#if DEVELOPER
logging_io = (getenv("LIGHTNINGD_DEV_LOG_IO") != NULL);
report_logging_io("LIGHTNINGD_DEV_LOG_IO");
#endif
} }
void status_setup_async(struct daemon_conn *master) void status_setup_async(struct daemon_conn *master)
{ {
#if DEVELOPER
logging_io = (getenv("LIGHTNINGD_DEV_LOG_IO") != NULL);
#endif
assert(status_fd == -1); assert(status_fd == -1);
assert(!status_conn); assert(!status_conn);
status_conn = master; status_conn = master;
setup_logging_sighandler(); setup_logging_sighandler();
#if DEVELOPER
logging_io = (getenv("LIGHTNINGD_DEV_LOG_IO") != NULL);
report_logging_io("LIGHTNINGD_DEV_LOG_IO");
#endif
} }
void status_send(const u8 *msg TAKES) void status_send(const u8 *msg TAKES)
{ {
report_logging_io("SIGUSR1");
if (status_fd >= 0) { if (status_fd >= 0) {
int type =fromwire_peektype(msg); int type =fromwire_peektype(msg);
if (!wire_sync_write(status_fd, msg)) if (!wire_sync_write(status_fd, msg))
@@ -82,6 +95,7 @@ static void status_peer_io_short(enum log_level iodir, const u8 *p)
void status_peer_io(enum log_level iodir, const u8 *p) void status_peer_io(enum log_level iodir, const u8 *p)
{ {
report_logging_io("SIGUSR1");
if (logging_io) if (logging_io)
status_io_full(iodir, "", p); status_io_full(iodir, "", p);
/* We get a huge amount of gossip; don't log it */ /* We get a huge amount of gossip; don't log it */
@@ -92,6 +106,7 @@ void status_peer_io(enum log_level iodir, const u8 *p)
void status_io(enum log_level iodir, const char *who, void status_io(enum log_level iodir, const char *who,
const void *data, size_t len) const void *data, size_t len)
{ {
report_logging_io("SIGUSR1");
if (!logging_io) if (!logging_io)
return; return;
/* Horribly inefficient, but so is logging IO generally. */ /* Horribly inefficient, but so is logging IO generally. */

2
tests/utils.py
View File

@@ -81,7 +81,7 @@ class TailableProc(object):
def __init__(self, outputDir=None, verbose=True): def __init__(self, outputDir=None, verbose=True):
self.logs = [] self.logs = []
self.logs_cond = threading.Condition(threading.RLock()) self.logs_cond = threading.Condition(threading.RLock())
self.env = os.environ self.env = os.environ.copy()
self.running = False self.running = False
self.proc = None self.proc = None
self.outputDir = outputDir self.outputDir = outputDir