mirrors/tres
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from shun159/fix/interpolation

Browse source 
tres/secure_channel: Fix a bug which interpolating error when logging
This commit is contained in:
Eishun Kondoh 2018-04-17 15:04:34 +09:00 • committed by GitHub
commit 2f5c59c649
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md Normal file
View file

@ -0,0 +1,7 @@
# Changelog
## develop (unreleased)
### Bugs Fixed
* tres/secure_channel: Fix to interpolate terms when logging

8
lib/tres/secure_channel.ex
View file

@ -580,19 +580,19 @@ defmodule Tres.SecureChannel do
end end
defp close_connection({:main_closed = disconnected_reason, reason}, state_data) do defp close_connection({:main_closed = disconnected_reason, reason}, state_data) do
warn("[#{__MODULE__}] connection terminated: Main connection down by #{reason}") warn("[#{__MODULE__}] connection terminated: Main connection down by #{inspect(reason)}")
%State{handler_pid: handler_pid} = state_data %State{handler_pid: handler_pid} = state_data
send(handler_pid, {:switch_disconnected, disconnected_reason}) send(handler_pid, {:switch_disconnected, disconnected_reason})
{:stop, :normal, %{state_data | socket: nil}} {:stop, :normal, %{state_data | socket: nil}}
end end
defp close_connection({:handler_down = _disconnected_reason, reason}, state_data) do defp close_connection({:handler_down = _disconnected_reason, reason}, state_data) do
warn("[#{__MODULE__}] connection terminated: Handler process down by #{reason}") warn("[#{__MODULE__}] connection terminated: Handler process down by #{inspect(reason)}")
{:stop, :normal, %{state_data | socket: nil}} {:stop, :normal, %{state_data | socket: nil}}
end end
defp close_connection({:trap_detected = disconnected_reason, reason}, state_data) do defp close_connection({:trap_detected = disconnected_reason, reason}, state_data) do
warn("[#{__MODULE__}] connection terminated: Trapped by #{reason}") warn("[#{__MODULE__}] connection terminated: Trapped by #{inspect(reason)}")
%State{handler_pid: handler_pid} = state_data %State{handler_pid: handler_pid} = state_data
send(handler_pid, {:switch_disconnected, disconnected_reason}) send(handler_pid, {:switch_disconnected, disconnected_reason})
{:stop, :normal, %{state_data | socket: nil}} {:stop, :normal, %{state_data | socket: nil}}
@ -606,7 +606,7 @@ defmodule Tres.SecureChannel do
end end
defp close_connection({:tcp_error, reason} = disconnected_reason, state_data) do defp close_connection({:tcp_error, reason} = disconnected_reason, state_data) do
warn("[#{__MODULE__}] connection terminated: TCP Error occured: #{reason}") warn("[#{__MODULE__}] connection terminated: TCP Error occured: #{inspect(reason)}")
%State{handler_pid: handler_pid} = state_data %State{handler_pid: handler_pid} = state_data
send(handler_pid, {:switch_disconnected, disconnected_reason}) send(handler_pid, {:switch_disconnected, disconnected_reason})
{:stop, :normal, %{state_data | socket: nil}} {:stop, :normal, %{state_data | socket: nil}}