Skip to content

Commit

Permalink
Revert "Added SysConfig Setting to configure timeout for DNS resolver…
Browse files Browse the repository at this point in the history
… queries. (#390)"

This reverts commit 827f68c.
  • Loading branch information
NiklasSchmitt committed Nov 8, 2023
1 parent ec51ec0 commit 77fcf18
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
7 changes: 0 additions & 7 deletions Kernel/Config/Files/XML/Framework.xml
Original file line number Diff line number Diff line change
Expand Up @@ -554,13 +554,6 @@
<Item ValueType="String" ValueRegex="">ns.example.com</Item>
</Value>
</Setting>
<Setting Name="ResolverTimeout" Required="0" Valid="0">
<Description Translatable="1">Sets the timeout (in seconds) for resolver DNS queries (i.e. during checking MX record if CheckMXRecord is enabled to protect against long agent UI responses in case of very slow DNS queries).</Description>
<Navigation>Core::Email</Navigation>
<Value>
<Item ValueType="String" ValueRegex="">3</Item>
</Value>
</Setting>
<Setting Name="CheckEmailAddresses" Required="1" Valid="1">
<Description Translatable="1">Makes the application check the syntax of email addresses.</Description>
<Navigation>Core::Email</Navigation>
Expand Down
5 changes: 2 additions & 3 deletions Kernel/System/CheckItem.pm
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,8 @@ sub CheckEmail {
if ($Resolver) {

# it's no fun to have this hanging in the web interface
my $ResolverTimeout = $ConfigObject->Get('ResolverTimeout') // 3;
$Resolver->tcp_timeout($ResolverTimeout);
$Resolver->udp_timeout($ResolverTimeout);
$Resolver->tcp_timeout(3);
$Resolver->udp_timeout(3);

# check if we need to use a specific name server
my $Nameserver = $ConfigObject->Get('CheckMXRecord::Nameserver');
Expand Down

0 comments on commit 77fcf18

Please sign in to comment.