mirror of
https://github.com/louislam/uptime-kuma.git
synced 2026-03-03 03:07:02 +00:00
Revert "feat(dns): add configurable timeout for DNS monitor (#6990)"
This reverts commit 0ce2ebb31e.
This commit is contained in:
@@ -24,13 +24,7 @@ class DnsMonitorType extends MonitorType {
|
||||
let dnsMessage = "";
|
||||
|
||||
const resolverServers = await this.resolveDnsResolverServers(monitor.dns_resolve_server);
|
||||
let dnsRes = await this.dnsResolve(
|
||||
monitor.hostname,
|
||||
resolverServers,
|
||||
monitor.port,
|
||||
monitor.dns_resolve_type,
|
||||
monitor.timeout != null ? monitor.timeout * 1000 : 5000
|
||||
);
|
||||
let dnsRes = await this.dnsResolve(monitor.hostname, resolverServers, monitor.port, monitor.dns_resolve_type);
|
||||
heartbeat.ping = dayjs().valueOf() - startTime;
|
||||
|
||||
const conditions = ConditionExpressionGroup.fromMonitor(monitor);
|
||||
@@ -175,11 +169,10 @@ class DnsMonitorType extends MonitorType {
|
||||
* @param {string[]} resolverServer Array of DNS server IP addresses to use
|
||||
* @param {string} resolverPort Port the DNS server is listening on
|
||||
* @param {string} rrtype The type of record to request
|
||||
* @param {number} timeout Timeout in milliseconds for the DNS query (defaults to c-ares default of 5000ms)
|
||||
* @returns {Promise<(string[] | object[] | object)>} DNS response
|
||||
*/
|
||||
async dnsResolve(hostname, resolverServer, resolverPort, rrtype, timeout = 5000) {
|
||||
const resolver = new Resolver({ timeout });
|
||||
async dnsResolve(hostname, resolverServer, resolverPort, rrtype) {
|
||||
const resolver = new Resolver();
|
||||
resolver.setServers(resolverServer.map((server) => `[${server}]:${resolverPort}`));
|
||||
if (rrtype === "PTR") {
|
||||
return await resolver.reverse(hostname);
|
||||
|
||||
@@ -1430,7 +1430,6 @@
|
||||
<!-- Timeout: HTTP / JSON query / Keyword / Ping / RabbitMQ / SNMP / Websocket Upgrade only -->
|
||||
<div
|
||||
v-if="
|
||||
monitor.type === 'dns' ||
|
||||
monitor.type === 'http' ||
|
||||
monitor.type === 'json-query' ||
|
||||
monitor.type === 'keyword' ||
|
||||
|
||||
Reference in New Issue
Block a user