aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/app/diameter_lib.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-09-27 11:41:26 +0200
committerAnders Svensson <[email protected]>2011-09-27 11:41:26 +0200
commit1e24333833f49e52ab3235148acf85cfd2c044b3 (patch)
treeac9e654a22a2b7c1d2270d194e743ca67f2700c3 /lib/diameter/src/app/diameter_lib.erl
parent13818bed4aa87c94546ae567750df912ba960623 (diff)
parent06a771d3d8915baeaad3908d8056eba45609d32d (diff)
downloadotp-1e24333833f49e52ab3235148acf85cfd2c044b3.tar.gz
otp-1e24333833f49e52ab3235148acf85cfd2c044b3.tar.bz2
otp-1e24333833f49e52ab3235148acf85cfd2c044b3.zip
Merge branch 'anders/diameter/logging/OTP-9579' into dev
* anders/diameter/logging/OTP-9579: Makefile dependency fix Remove duplicate info from error report at encode failure Use single format for error_logger reports Fix improper use of error_logger:info_report/2
Diffstat (limited to 'lib/diameter/src/app/diameter_lib.erl')
-rw-r--r--lib/diameter/src/app/diameter_lib.erl13
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/diameter/src/app/diameter_lib.erl b/lib/diameter/src/app/diameter_lib.erl
index 46fd87c591..f65e356444 100644
--- a/lib/diameter/src/app/diameter_lib.erl
+++ b/lib/diameter/src/app/diameter_lib.erl
@@ -46,14 +46,9 @@
report(Reason, MFA) ->
info_report(Reason, MFA).
-info_report(Reason, {M,F,A}) ->
- error_logger:info_report(" Reason: ~p~n"
- " Pid: ~p~n"
- " Node: ~p~n"
- " Module: ~p~n"
- " Function: ~p~n"
- "Arguments: ~p~n",
- [Reason, self(), node(), M, F, A]).
+info_report(Reason, MFA) ->
+ report(fun error_logger:info_report/1, Reason, MFA),
+ true.
%%% ---------------------------------------------------------------------------
%%% # error_report(Reason, MFA)
@@ -69,7 +64,7 @@ warning_report(Reason, MFA) ->
report(fun error_logger:warning_report/1, Reason, MFA).
report(Fun, Reason, MFA) ->
- Fun([{reason, Reason}, {who, self()}, {where, node()}, {what, MFA}]),
+ Fun([{why, Reason}, {who, self()}, {what, MFA}]),
false.
%%% ---------------------------------------------------------------------------