Skip to content

Commit 3fd2317

Browse files
committed
Fix log formatting for anonymous TURN sessions
Closes processone/ejabberd#4403.
1 parent 7b33872 commit 3fd2317

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Version 1.2.20
2+
3+
* Fix formatting of log messages for anonymous TURN sessions.
4+
15
# Version 1.2.19
26

37
* Fix handling of some configuration options.

src/stun_logger.erl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ set_metadata(SubDomain, Transport, ID) ->
5959

6060
-spec set_metadata(sub_domain(), sock_mod(), binary(),
6161
{inet:ip_address(), inet:port_number()},
62-
binary() | anonymous) -> ok.
62+
binary() | undefined) -> ok.
6363
set_metadata(SubDomain, SockMod, ID, Addr, User) ->
6464
put(?MODULE, #{domain => [stun, SubDomain],
6565
stun_transport => encode_transport(SockMod),
@@ -127,7 +127,7 @@ set_metadata(SubDomain, Transport, ID) ->
127127

128128
-spec set_metadata(sub_domain(), sock_mod(), binary(),
129129
{inet:ip_address(), inet:port_number()},
130-
binary() | anonymous) -> ok.
130+
binary() | undefined) -> ok.
131131
set_metadata(SubDomain, SockMod, ID, Addr, User) ->
132132
logger:set_process_metadata(
133133
#{domain => [stun, SubDomain],
@@ -163,7 +163,7 @@ filter(_Event, _Extra) ->
163163
-spec set_metadata(sub_domain(), sock_mod(), binary(),
164164
{inet:ip_address(), inet:port_number()}) -> ok.
165165
set_metadata(SubDomain, SockMod, ID, Addr) ->
166-
set_metadata(SubDomain, SockMod, ID, Addr, anonymous).
166+
set_metadata(SubDomain, SockMod, ID, Addr, undefined).
167167

168168
-spec make_id() -> binary().
169169
make_id() ->
@@ -214,6 +214,6 @@ format_msg(Text, #{stun_transport := Transport}) ->
214214
{"~s [~s]",
215215
[Text, Transport]}.
216216

217-
-spec format_user(anonymous | iodata()) -> iodata().
218-
format_user(anonymous) -> <<"anonymous">>;
217+
-spec format_user(iodata() | undefined) -> iodata().
218+
format_user(undefined) -> <<"anonymous">>;
219219
format_user(User) -> [<<"user ">>, User].

0 commit comments

Comments
 (0)