Skip to content

Commit 075aa61

Browse files
authored
fix: Revert "feat(dns): add configurable timeout for DNS monitor" (louislam#7036)
1 parent fef4826 commit 075aa61

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

server/monitor-types/dns.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,7 @@ class DnsMonitorType extends MonitorType {
2424
let dnsMessage = "";
2525

2626
const resolverServers = await this.resolveDnsResolverServers(monitor.dns_resolve_server);
27-
let dnsRes = await this.dnsResolve(
28-
monitor.hostname,
29-
resolverServers,
30-
monitor.port,
31-
monitor.dns_resolve_type,
32-
monitor.timeout != null ? monitor.timeout * 1000 : 5000
33-
);
27+
let dnsRes = await this.dnsResolve(monitor.hostname, resolverServers, monitor.port, monitor.dns_resolve_type);
3428
heartbeat.ping = dayjs().valueOf() - startTime;
3529

3630
const conditions = ConditionExpressionGroup.fromMonitor(monitor);
@@ -175,11 +169,10 @@ class DnsMonitorType extends MonitorType {
175169
* @param {string[]} resolverServer Array of DNS server IP addresses to use
176170
* @param {string} resolverPort Port the DNS server is listening on
177171
* @param {string} rrtype The type of record to request
178-
* @param {number} timeout Timeout in milliseconds for the DNS query (defaults to c-ares default of 5000ms)
179172
* @returns {Promise<(string[] | object[] | object)>} DNS response
180173
*/
181-
async dnsResolve(hostname, resolverServer, resolverPort, rrtype, timeout = 5000) {
182-
const resolver = new Resolver({ timeout });
174+
async dnsResolve(hostname, resolverServer, resolverPort, rrtype) {
175+
const resolver = new Resolver();
183176
resolver.setServers(resolverServer.map((server) => `[${server}]:${resolverPort}`));
184177
if (rrtype === "PTR") {
185178
return await resolver.reverse(hostname);

src/pages/EditMonitor.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1433,7 +1433,6 @@
14331433
<!-- Timeout: HTTP / JSON query / Keyword / Ping / RabbitMQ / SNMP / Websocket Upgrade only -->
14341434
<div
14351435
v-if="
1436-
monitor.type === 'dns' ||
14371436
monitor.type === 'http' ||
14381437
monitor.type === 'json-query' ||
14391438
monitor.type === 'keyword' ||

0 commit comments

Comments
 (0)