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

transition from status_trace() to status_debug

Browse Source
This commit is contained in:
darosior
2019-09-08 18:39:26 +02:00
committed by Rusty Russell
parent 0504a51211
commit 0b0ad4c22d
27 changed files with 210 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
connectd/connectd.c
View File

@@ -353,7 +353,7 @@ static struct io_plan *retry_peer_connected(struct io_conn *conn,
struct io_plan *plan;
/*~ As you can see, we've had issues with this code before :( */
status_trace("peer %s: processing now old peer gone",
status_debug("peer %s: processing now old peer gone",
type_to_string(tmpctx, struct node_id, &pr->id));
/*~ Usually the pattern is to return this directly, but we have to free
@@ -378,7 +378,7 @@ static struct io_plan *peer_reconnected(struct io_conn *conn,
u8 *msg;
struct peer_reconnected *pr;
status_trace("peer %s: reconnect",
status_debug("peer %s: reconnect",
type_to_string(tmpctx, struct node_id, id));
/* Tell master to kill it: will send peer_disconnect */
@@ -484,7 +484,7 @@ static struct io_plan *handshake_in_success(struct io_conn *conn,
{
struct node_id id;
node_id_from_pubkey(&id, id_key);
status_trace("Connect IN from %s",
status_debug("Connect IN from %s",
type_to_string(tmpctx, struct node_id, &id));
return peer_exchange_initmsg(conn, daemon, cs, &id, addr);
}
@@ -499,7 +499,7 @@ static struct io_plan *connection_in(struct io_conn *conn, struct daemon *daemon
/* The cast here is a weird Berkeley sockets API feature... */
if (getpeername(io_conn_fd(conn), (struct sockaddr *)&s, &len) != 0) {
status_trace("Failed to get peername for incoming conn: %s",
status_debug("Failed to get peername for incoming conn: %s",
strerror(errno));
return io_close(conn);
}
@@ -545,7 +545,7 @@ static struct io_plan *handshake_out_success(struct io_conn *conn,
node_id_from_pubkey(&id, key);
connect->connstate = "Exchanging init messages";
status_trace("Connect OUT to %s",
status_debug("Connect OUT to %s",
type_to_string(tmpctx, struct node_id, &id));
return peer_exchange_initmsg(conn, connect->daemon, cs, &id, addr);
}
@@ -563,7 +563,7 @@ struct io_plan *connection_out(struct io_conn *conn, struct connecting *connect)
}
/* FIXME: Timeout */
status_trace("Connected out for %s",
status_debug("Connected out for %s",
type_to_string(tmpctx, struct node_id, &connect->id));
connect->connstate = "Cryptographic handshake";
@@ -604,7 +604,7 @@ static void PRINTF_FMT(5,6)
addrhint);
daemon_conn_send(daemon->master, take(msg));
status_trace("Failed connected out for %s: %s",
status_debug("Failed connected out for %s: %s",
type_to_string(tmpctx, struct node_id, id),
err);
}
@@ -840,7 +840,7 @@ static int make_listen_fd(int domain, void *addr, socklen_t len, bool mayfail)
status_failed(STATUS_FAIL_INTERNAL_ERROR,
"Failed to create %u socket: %s",
domain, strerror(errno));
status_trace("Failed to create %u socket: %s",
status_debug("Failed to create %u socket: %s",
domain, strerror(errno));
return -1;
}
@@ -856,7 +856,7 @@ static int make_listen_fd(int domain, void *addr, socklen_t len, bool mayfail)
status_failed(STATUS_FAIL_INTERNAL_ERROR,
"Failed to bind on %u socket: %s",
domain, strerror(errno));
status_trace("Failed to create %u socket: %s",
status_debug("Failed to create %u socket: %s",
domain, strerror(errno));
goto fail;
}
@@ -887,7 +887,7 @@ static bool handle_wireaddr_listen(struct daemon *daemon,
/* We might fail if IPv6 bound to port first */
fd = make_listen_fd(AF_INET, &addr, sizeof(addr), mayfail);
if (fd >= 0) {
status_trace("Created IPv4 listener on port %u",
status_debug("Created IPv4 listener on port %u",
wireaddr->port);
add_listen_fd(daemon, fd, mayfail);
return true;
@@ -897,7 +897,7 @@ static bool handle_wireaddr_listen(struct daemon *daemon,
wireaddr_to_ipv6(wireaddr, &addr6);
fd = make_listen_fd(AF_INET6, &addr6, sizeof(addr6), mayfail);
if (fd >= 0) {
status_trace("Created IPv6 listener on port %u",
status_debug("Created IPv6 listener on port %u",
wireaddr->port);
add_listen_fd(daemon, fd, mayfail);
return true;
@@ -1041,7 +1041,7 @@ static struct wireaddr_internal *setup_listeners(const tal_t *ctx,
unlink(wa.u.sockname);
fd = make_listen_fd(AF_UNIX, &addrun, sizeof(addrun),
false);
status_trace("Created socket listener on file %s",
status_debug("Created socket listener on file %s",
addrun.sun_path);
add_listen_fd(daemon, fd, false);
/* We don't announce socket names, though we allow
@@ -1172,7 +1172,7 @@ static struct io_plan *connect_init(struct io_conn *conn,
/* Resolve Tor proxy address if any: we need an addrinfo to connect()
* to. */
if (proxyaddr) {
status_trace("Proxy address: %s",
status_debug("Proxy address: %s",
fmt_wireaddr(tmpctx, proxyaddr));
daemon->proxyaddr = wireaddr_to_addrinfo(daemon, proxyaddr);
tal_free(proxyaddr);
@@ -1180,7 +1180,7 @@ static struct io_plan *connect_init(struct io_conn *conn,
daemon->proxyaddr = NULL;
if (broken_resolver(daemon)) {
status_trace("Broken DNS resolver detected, will check for "
status_debug("Broken DNS resolver detected, will check for "
"dummy replies");
}
@@ -1274,16 +1274,16 @@ static void add_seed_addrs(struct wireaddr_internal **addrs,
hostnames = seednames(tmpctx, id);
for (size_t i = 0; i < tal_count(hostnames); i++) {
status_trace("Resolving %s", hostnames[i]);
status_debug("Resolving %s", hostnames[i]);
if (!wireaddr_from_hostname(new_addrs, hostnames[i], DEFAULT_PORT, NULL,
broken_reply, NULL)) {
status_trace("Could not resolve %s", hostnames[i]);
status_debug("Could not resolve %s", hostnames[i]);
} else {
for (size_t i = 0; i < tal_count(new_addrs); i++) {
struct wireaddr_internal a;
a.itype = ADDR_INTERNAL_WIREADDR;
a.u.wireaddr = *new_addrs[i];
status_trace("Resolved %s to %s", hostnames[i],
status_debug("Resolved %s to %s", hostnames[i],
type_to_string(tmpctx, struct wireaddr,
&a.u.wireaddr));
tal_arr_expand(addrs, a);

2
connectd/handshake.c
View File

@@ -335,7 +335,7 @@ static struct io_plan *handshake_failed_(struct io_conn *conn,
struct handshake *h,
const char *function, int line)
{
status_trace("%s: handshake failed %s:%u",
status_debug("%s: handshake failed %s:%u",
h->side == RESPONDER ? "Responder" : "Initiator",
function, line);
errno = EPROTO;

6
connectd/netaddress.c
View File

@@ -204,20 +204,20 @@ static bool get_local_sockname(int af, void *saddr, socklen_t saddrlen)
{
int fd = socket(af, SOCK_DGRAM, 0);
if (fd < 0) {
status_trace("Failed to create %u socket: %s",
status_debug("Failed to create %u socket: %s",
af, strerror(errno));
return false;
}
if (connect(fd, saddr, saddrlen) != 0) {
status_trace("Failed to connect %u socket: %s",
status_debug("Failed to connect %u socket: %s",
af, strerror(errno));
close(fd);
return false;
}
if (getsockname(fd, saddr, &saddrlen) != 0) {
status_trace("Failed to get %u socket name: %s",
status_debug("Failed to get %u socket name: %s",
af, strerror(errno));
close(fd);
return false;

2
connectd/peer_exchange_initmsg.c
View File

@@ -51,7 +51,7 @@ static struct io_plan *peer_init_received(struct io_conn *conn,
return read_init(conn, peer);
if (!fromwire_init(peer, msg, &globalfeatures, &localfeatures)) {
status_trace("peer %s bad fromwire_init '%s', closing",
status_debug("peer %s bad fromwire_init '%s', closing",
type_to_string(tmpctx, struct node_id, &peer->id),
tal_hex(tmpctx, msg));
return io_close(conn);

2
connectd/test/run-initiator-success.c
View File

@@ -34,7 +34,7 @@ static struct io_plan *test_read(struct io_conn *conn,
struct handshake *),
struct handshake *h);
#define SUPERVERBOSE status_trace
#define SUPERVERBOSE status_debug
void status_fmt(enum log_level level UNUSED, const char *fmt, ...)
{
va_list ap;

10
connectd/tor.c
View File

@@ -47,7 +47,7 @@ static struct io_plan *connect_finish2(struct io_conn *conn,
status_io(LOG_IO_IN, "proxy",
connect->buffer + SIZE_OF_RESPONSE + SIZE_OF_IPV4_RESPONSE,
SIZE_OF_IPV6_RESPONSE - SIZE_OF_IPV4_RESPONSE);
status_trace("Now try LN connect out for host %s", connect->host);
status_debug("Now try LN connect out for host %s", connect->host);
return connection_out(conn, connect->connect);
}
@@ -68,17 +68,17 @@ static struct io_plan *connect_finish(struct io_conn *conn,
&connect_finish2, connect);
} else if ( connect->buffer[3] == SOCKS_TYP_IPV4) {
status_trace("Now try LN connect out for host %s",
status_debug("Now try LN connect out for host %s",
connect->host);
return connection_out(conn, connect->connect);
} else {
status_trace
status_debug
("Tor connect out for host %s error invalid type return ",
connect->host);
return io_close(conn);
}
} else {
status_trace("Tor connect out for host %s error: %x ",
status_debug("Tor connect out for host %s error: %x ",
connect->host, connect->buffer[1]);
return io_close(conn);
}
@@ -103,7 +103,7 @@ static struct io_plan *io_tor_connect_after_resp_to_connect(struct io_conn
status_io(LOG_IO_IN, "proxy", connect->buffer, 2);
if (connect->buffer[1] == SOCKS_ERROR) {
status_trace("Connected out for %s error", connect->host);
status_debug("Connected out for %s error", connect->host);
return io_close(conn);
}
/* make the V5 request */