MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-17 23:40:57 +01:00
Code Issues Releases Wiki Activity

modules/net_dns_resolver: Add assertion; tweak log format consistency.

Browse source
This commit is contained in:
Jason Volk 2019-07-24 14:06:49 -07:00
parent 9c7ad47e59
commit d034ee8dde
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
modules/net_dns_resolver.cc
View file

@ -152,6 +152,7 @@ noexcept
sendq_context.terminate(); sendq_context.terminate();
recv_context.terminate(); recv_context.terminate();
assert(sendq.empty());
assert(tags.empty()); assert(tags.empty());
} }
@ -417,12 +418,12 @@ try
thread_local char buf[128]; thread_local char buf[128];
log::debug log::debug
{ {
log, "dns %s send tag:%u t:%u qtype:%u `%s'", log, "send tag:%u qtype:%u t:%u `%s' to %s",
string(buf, make_ipport(ep)),
tag.id, tag.id,
tag.tries,
tag.opts.qtype, tag.opts.qtype,
host(tag.hp) tag.tries,
host(tag.hp),
string(buf, make_ipport(ep)),
}; };
#endif #endif
} }
@ -446,10 +447,10 @@ ircd::net::dns::resolver::queue_query(tag &tag)
log::debug log::debug
{ {
log, "dns tag:%u t:%u qtype:%u added to sendq (tags:%zu sendq:%zu)", log, "queu tag:%u qtype:%u t:%u (tags:%zu sendq:%zu)",
tag.id, tag.id,
tag.tries,
tag.opts.qtype, tag.opts.qtype,
tag.tries,
tags.size(), tags.size(),
sendq.size() sendq.size()
}; };
@ -582,7 +583,7 @@ ircd::net::dns::resolver::handle_reply(const ipport &from,
const header &header, const header &header,
const const_buffer &body) const const_buffer &body)
{ {
thread_local char addr_strbuf[2][128]; thread_local char strbuf[2][128];
const std::lock_guard lock const std::lock_guard lock
{ {
// The primary mutex is locked here while this result is // The primary mutex is locked here while this result is
@ -599,7 +600,7 @@ ircd::net::dns::resolver::handle_reply(const ipport &from,
throw error throw error
{ {
"DNS reply from %s for unrecognized tag id:%u", "DNS reply from %s for unrecognized tag id:%u",
string(addr_strbuf[0], from), string(strbuf[0], from),
header.id header.id
}; };
@ -608,18 +609,19 @@ ircd::net::dns::resolver::handle_reply(const ipport &from,
throw error throw error
{ {
"DNS reply from %s for tag:%u which we sent to %s", "DNS reply from %s for tag:%u which we sent to %s",
string(addr_strbuf[0], from), string(strbuf[0], from),
header.id, header.id,
string(addr_strbuf[1], tag.server) string(strbuf[1], tag.server)
}; };
log::debug log::debug
{ {
log, "dns %s recv tag:%u t:%u qtype:%u qd:%u an:%u ns:%u ar:%u", log, "recv tag:%u qtype:%u t:%u from %s in %s qd:%u an:%u ns:%u ar:%u",
string(addr_strbuf[0], from),
tag.id, tag.id,
tag.tries,
tag.opts.qtype, tag.opts.qtype,
tag.tries,
string(strbuf[0], from),
pretty(strbuf[1], nanoseconds(now<steady_point>() - tag.last), 1),
header.qdcount, header.qdcount,
header.ancount, header.ancount,
header.nscount, header.nscount,
@ -632,11 +634,11 @@ ircd::net::dns::resolver::handle_reply(const ipport &from,
{ {
log::error log::error
{ {
log, "dns %s recv tag:%u t:%u qtype:%u protocol error #%u :%s", log, "recv tag:%u qtype:%u t:%u from %s protocol error #%u :%s",
string(addr_strbuf[0], from),
tag.id, tag.id,
tag.tries,
tag.opts.qtype, tag.opts.qtype,
tag.tries,
string(strbuf[0], from),
header.rcode, header.rcode,
rfc1035::rcode.at(header.rcode) rfc1035::rcode.at(header.rcode)
}; };
@ -839,10 +841,10 @@ ircd::net::dns::resolver::remove(tag &tag,
{ {
log::debug log::debug
{ {
log, "dns tag:%u t:%u qtype:%u removing (tags:%zu sendq:%zu)", log, "fini tag:%u qtype:%u t:%u (tags:%zu sendq:%zu)",
tag.id, tag.id,
tag.tries,
tag.opts.qtype, tag.opts.qtype,
tag.tries,
tags.size(), tags.size(),
sendq.size() sendq.size()
}; };