mirror of
https://github.com/bjc/prosody.git
synced 2025-04-03 21:27:38 +03:00
net.unbound: Remove compat for missing promises (pre-0.11)
Code existed in a separate project before merged into Prosody, so util.promise was not always around.
This commit is contained in:
parent
9be5cb3fbd
commit
02c3cc978d
1 changed files with 12 additions and 15 deletions
|
@ -16,7 +16,7 @@ local noop = function() end;
|
|||
local log = require "util.logger".init("unbound");
|
||||
local net_server = require "net.server";
|
||||
local libunbound = require"lunbound";
|
||||
local have_promise, promise = pcall(require, "util.promise");
|
||||
local promise = require"util.promise";
|
||||
|
||||
local gettime = require"socket".gettime;
|
||||
local dns_utils = require"util.dns";
|
||||
|
@ -178,21 +178,18 @@ local _M = {
|
|||
};
|
||||
};
|
||||
|
||||
local lookup_promise;
|
||||
if have_promise then
|
||||
function lookup_promise(_, qname, qtype, qclass)
|
||||
return promise.new(function (resolve, reject)
|
||||
local function callback(answer, err)
|
||||
if err then
|
||||
return reject(err);
|
||||
else
|
||||
return resolve(answer);
|
||||
end
|
||||
local function lookup_promise(_, qname, qtype, qclass)
|
||||
return promise.new(function (resolve, reject)
|
||||
local function callback(answer, err)
|
||||
if err then
|
||||
return reject(err);
|
||||
else
|
||||
return resolve(answer);
|
||||
end
|
||||
local ret, err = lookup(callback, qname, qtype, qclass)
|
||||
if not ret then reject(err); end
|
||||
end);
|
||||
end
|
||||
end
|
||||
local ret, err = lookup(callback, qname, qtype, qclass)
|
||||
if not ret then reject(err); end
|
||||
end);
|
||||
end
|
||||
|
||||
local wrapper = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue