Skip to content

Commit

Permalink
update method
Browse files Browse the repository at this point in the history
Co-authored-by: Sergey Fedorov <[email protected]>
  • Loading branch information
2 people authored and TonyCTHsu committed Nov 1, 2024
1 parent 0b83cab commit dfc600f
Showing 1 changed file with 18 additions and 16 deletions.
34 changes: 18 additions & 16 deletions lib/datadog/core/configuration/agent_settings_resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -239,23 +239,25 @@ def should_use_uds?
end

def mixed_http_and_uds
unless defined?(@mixed_http_and_uds)
@mixed_http_and_uds = (configured_hostname || configured_port) && can_use_uds?
if @mixed_http_and_uds
warn_if_configuration_mismatch(
[
DetectedConfiguration.new(
friendly_name: 'configuration for unix domain socket',
value: parsed_url.to_s,
),
DetectedConfiguration.new(
friendly_name: 'configuration of hostname/port for http/https use',
value: "hostname: '#{hostname}', port: '#{port}'",
),
]
)
end
return @mixed_http_and_uds if defined?(@mixed_http_and_uds)

@mixed_http_and_uds = (configured_hostname || configured_port) && can_use_uds?
if @mixed_http_and_uds
warn_if_configuration_mismatch(
[
DetectedConfiguration.new(
friendly_name: 'configuration for unix domain socket',
value: parsed_url.to_s,
),
DetectedConfiguration.new(
friendly_name: 'configuration of hostname/port for http/https use',
value: "hostname: '#{hostname}', port: '#{port}'",
),
]
)
end

@mixed_http_and_uds
end

def can_use_uds?
Expand Down

0 comments on commit dfc600f

Please sign in to comment.