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

logging: always dump a crash log, but make files per-pid.

Browse Source 
Someone had a 21GB crash.log, which doesn't help anyone!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-08-22 19:36:42 +09:30
committed by Christian Decker
parent 213be90e77
commit 00696277d2
2 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lightningd/log.c
View File

@@ -548,9 +548,6 @@ static void log_dump_to_file(int fd, const struct log_book *lr)
struct log_data data; struct log_data data;
time_t start; time_t start;
write_all(fd, "Start of new crash log\n",
strlen("Start of new crash log\n"));
i = list_top(&lr->log, const struct log_entry, list); i = list_top(&lr->log, const struct log_entry, list);
if (!i) { if (!i) {
write_all(fd, "0 bytes:\n\n", strlen("0 bytes:\n\n")); write_all(fd, "0 bytes:\n\n", strlen("0 bytes:\n\n"));
@@ -571,28 +568,27 @@ static void log_dump_to_file(int fd, const struct log_book *lr)
/* FIXME: Dump peer logs! */ /* FIXME: Dump peer logs! */
void log_backtrace_exit(void) void log_backtrace_exit(void)
{ {
int fd;
char logfile[sizeof("/tmp/lightning-crash.log.%u") + STR_MAX_CHARS(int)];
if (!crashlog) if (!crashlog)
return; return;
/* If we're not already pointing at a log file, make one */ /* We expect to be in config dir. */
if (crashlog->lr->print == log_to_stdout) { snprintf(logfile, sizeof(logfile), "crash.log.%u", getpid());
const char *logfile = NULL;
int fd;
/* We expect to be in config dir. */ fd = open(logfile, O_WRONLY|O_CREAT|O_TRUNC, 0600);
logfile = "crash.log"; if (fd < 0) {
fd = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0600); snprintf(logfile, sizeof(logfile),
if (fd < 0) { "/tmp/lightning-crash.log.%u", getpid());
logfile = "/tmp/lightning-crash.log"; fd = open(logfile, O_WRONLY|O_CREAT|O_TRUNC, 0600);
fd = open(logfile, O_WRONLY|O_CREAT, 0600); }
}
/* Dump entire log. */ /* Dump entire log. */
if (fd >= 0) { if (fd >= 0) {
log_dump_to_file(fd, crashlog->lr); log_dump_to_file(fd, crashlog->lr);
close(fd); close(fd);
fprintf(stderr, "Log dumped in %s\n", logfile); fprintf(stderr, "Log dumped in %s\n", logfile);
}
} }
} }

14
tests/test_misc.py
View File

@@ -2,7 +2,7 @@ from decimal import Decimal
from fixtures import * # noqa: F401,F403 from fixtures import * # noqa: F401,F403
from flaky import flaky from flaky import flaky
from lightning import RpcError from lightning import RpcError
from utils import DEVELOPER, sync_blockheight, only_one, wait_for, TailableProc from utils import DEVELOPER, VALGRIND, sync_blockheight, only_one, wait_for, TailableProc
from ephemeral_port_reserve import reserve from ephemeral_port_reserve import reserve
import json import json
@@ -868,3 +868,15 @@ def test_logging(node_factory):
assert log1[-1].endswith("Ending log due to SIGHUP\n") assert log1[-1].endswith("Ending log due to SIGHUP\n")
assert log2[0].endswith("Started log due to SIGHUP\n") assert log2[0].endswith("Started log due to SIGHUP\n")
@unittest.skipIf(VALGRIND and not DEVELOPER,
"Backtrace upsets valgrind: only suppressed in DEVELOPER mode")
def test_crashlog(node_factory):
l1 = node_factory.get_node(may_fail=True)
crashpath = os.path.join(l1.daemon.lightning_dir,
'crash.log.{}'.format(l1.daemon.proc.pid))
assert not os.path.exists(crashpath)
l1.daemon.proc.send_signal(signal.SIGSEGV)
wait_for(lambda: os.path.exists(crashpath))