Software / code / prosody
Diff
net/resolvers/service.lua @ 11901:26406ce35e20
net.connect: Propagate last error message from resolvers
Previously it would only say "unable to resolve server" for all DNS
problems. While "NoError in A lookup" might not make much sense to
users, it should help in debugging more than the previous generic error.
Friendlier errors will be future work.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 12 Nov 2021 16:52:55 +0100 |
| parent | 11710:26a8cc9d9eb7 |
| child | 12025:6ed7fd28f5e3 |
line wrap: on
line diff
--- a/net/resolvers/service.lua Fri Nov 12 13:30:39 2021 +0000 +++ b/net/resolvers/service.lua Fri Nov 12 16:52:55 2021 +0100 @@ -20,6 +20,9 @@ self.resolver = basic.new(unpack(next_target, 1, 4)); end self.resolver:next(function (...) + if self.resolver then + self.last_error = self.resolver.last_error; + end if ... == nil then self.resolver = nil; self:next(cb); @@ -57,12 +60,15 @@ if #answer == 0 then if self.extra and self.extra.default_port then table.insert(targets, { self.hostname, self.extra.default_port, self.conn_type, self.extra }); + else + self.last_error = "zero SRV records found"; end ready(); return; end if #answer == 1 and answer[1].srv.target == "." then -- No service here + self.last_error = "service explicitly unavailable"; ready(); return; end @@ -71,6 +77,8 @@ for _, record in ipairs(answer) do table.insert(targets, { record.srv.target, record.srv.port, self.conn_type, self.extra }); end + else + self.last_error = err; end ready(); end, "_" .. self.service .. "._" .. self.conn_type .. "." .. self.hostname, "SRV", "IN");
