viscous/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2026-03-03 03:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat(dns): add configurable timeout for DNS monitor (#6990)"

Browse Source 
This reverts commit 0ce2ebb31e.
This commit is contained in:
Louis Lam
2026-02-24 11:39:50 +08:00
committed by GitHub
parent 0ce2ebb31e
commit 2a3e0f172f
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/monitor-types/dns.js
View File

@@ -24,13 +24,7 @@ class DnsMonitorType extends MonitorType {
let dnsMessage = ""; let dnsMessage = "";
const resolverServers = await this.resolveDnsResolverServers(monitor.dns_resolve_server); const resolverServers = await this.resolveDnsResolverServers(monitor.dns_resolve_server);
let dnsRes = await this.dnsResolve( let dnsRes = await this.dnsResolve(monitor.hostname, resolverServers, monitor.port, monitor.dns_resolve_type);
monitor.hostname,
resolverServers,
monitor.port,
monitor.dns_resolve_type,
monitor.timeout != null ? monitor.timeout * 1000 : 5000
);
heartbeat.ping = dayjs().valueOf() - startTime; heartbeat.ping = dayjs().valueOf() - startTime;
const conditions = ConditionExpressionGroup.fromMonitor(monitor); 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[]} resolverServer Array of DNS server IP addresses to use
* @param {string} resolverPort Port the DNS server is listening on * @param {string} resolverPort Port the DNS server is listening on
* @param {string} rrtype The type of record to request * @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 * @returns {Promise<(string[] | object[] | object)>} DNS response
*/ */
async dnsResolve(hostname, resolverServer, resolverPort, rrtype, timeout = 5000) { async dnsResolve(hostname, resolverServer, resolverPort, rrtype) {
const resolver = new Resolver({ timeout }); const resolver = new Resolver();
resolver.setServers(resolverServer.map((server) => `[${server}]:${resolverPort}`)); resolver.setServers(resolverServer.map((server) => `[${server}]:${resolverPort}`));
if (rrtype === "PTR") { if (rrtype === "PTR") {
return await resolver.reverse(hostname); return await resolver.reverse(hostname);

1
src/pages/EditMonitor.vue
View File

@@ -1430,7 +1430,6 @@
<!-- Timeout: HTTP / JSON query / Keyword / Ping / RabbitMQ / SNMP / Websocket Upgrade only --> <!-- Timeout: HTTP / JSON query / Keyword / Ping / RabbitMQ / SNMP / Websocket Upgrade only -->
<div <div
v-if=" v-if="
monitor.type === 'dns' ||
monitor.type === 'http' || monitor.type === 'http' ||
monitor.type === 'json-query' || monitor.type === 'json-query' ||
monitor.type === 'keyword' || monitor.type === 'keyword' ||