Skip to content

add logging if send message fails #2631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jvanderhoof wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −8
Draft

add logging if send message fails #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd3741
add logging if send message fails
jvanderhoof Aug 11, 2022
8dc2c2d
enable logging on rspec tests
jvanderhoof Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/domain/authentication/authn_k8s/web_socket_client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def connect(url, options = {})
when Resolv::IPv4::Regex, Resolv::IPv6::Regex
# don't set SNI, as IP addresses in SNI is not valid
# per RFC 6066, section 3.

# Avoid openssl warning
ctx.verify_hostname = false
else
Expand Down Expand Up @@ -106,13 +106,16 @@ def connect(url, options = {})
end

def send(data, opt = { type: :text })
puts("Websocket Send: attempting to send: #{data.inspect}")
return if !@handshaked || @closed

type = opt[:type]
frame = ::WebSocket::Frame::Outgoing::Client.new(data: data, type: type, version: @handshake.version)
begin
@socket.write(frame.to_s)
rescue Errno::EPIPE => e
Rails.logger.error("Websocket failed to send: '#{data}'")
Copy link

@qlty-cloud-legacy qlty-cloud-legacy bot Aug 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Authentication::AuthnK8s::WebSocketClient#send calls 'Rails.logger' 2 times

Rails.logger.error("error: #{e}")
@pipe_broken = true
emit(:__close, e)
end
Expand Down
14 changes: 7 additions & 7 deletions spec/controllers/authenticate_controller_authn_k8s_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

# Turn on logs to debug
#
# Rails.logger.extend(ActiveSupport::Logger.broadcast(ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))))
# Rails.logger.level = :info
# Audit.logger = Audit::Log::SyslogAdapter.new(
# Logger.new(STDOUT).tap do |logger|
# logger.formatter = Logger::Formatter::RFC5424Formatter
# end
# )
Rails.logger.extend(ActiveSupport::Logger.broadcast(ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))))
Rails.logger.level = :info
Audit.logger = Audit::Log::SyslogAdapter.new(
Logger.new(STDOUT).tap do |logger|
logger.formatter = Logger::Formatter::RFC5424Formatter
end
)

def set_variable_value(account, resource_id, value)
post("/secrets/#{account}/variable/#{resource_id}", env: admin_request_env.merge({ 'RAW_POST_DATA' => value }))
Expand Down