diff options
| author | Anders Svensson <[email protected]> | 2011-09-27 11:41:26 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-09-27 11:41:26 +0200 |
| commit | 1e24333833f49e52ab3235148acf85cfd2c044b3 (patch) | |
| tree | ac9e654a22a2b7c1d2270d194e743ca67f2700c3 /lib/diameter/src/app/diameter_service.erl | |
| parent | 13818bed4aa87c94546ae567750df912ba960623 (diff) | |
| parent | 06a771d3d8915baeaad3908d8056eba45609d32d (diff) | |
| download | otp-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_service.erl')
| -rw-r--r-- | lib/diameter/src/app/diameter_service.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/diameter/src/app/diameter_service.erl b/lib/diameter/src/app/diameter_service.erl index 01a125fdc7..a1cf1f6405 100644 --- a/lib/diameter/src/app/diameter_service.erl +++ b/lib/diameter/src/app/diameter_service.erl @@ -463,7 +463,7 @@ handle_call(stop, _From, S) -> %% stating a monitor that waits for DOWN before returning. handle_call(Req, From, S) -> - ?REPORT(unknown_request, ?FUNC, [Req, From]), + unexpected(handle_call, [Req, From], S), {reply, nok, S}. %%% --------------------------------------------------------------------------- @@ -471,7 +471,7 @@ handle_call(Req, From, S) -> %%% --------------------------------------------------------------------------- handle_cast(Req, S) -> - ?REPORT(unknown_request, ?FUNC, [Req]), + unexpected(handle_cast, [Req], S), {noreply, S}. %%% --------------------------------------------------------------------------- @@ -553,8 +553,8 @@ transition({failover, TRef, Seqs}, S) -> failover(TRef, Seqs, S), ok; -transition(Req, _) -> - ?REPORT(unknown_request, ?FUNC, [Req]), +transition(Req, S) -> + unexpected(handle_info, [Req], S), ok. %%% --------------------------------------------------------------------------- @@ -591,6 +591,9 @@ code_change(FromVsn, SvcName, Extra, #diameter_app{alias = Alias} = A) -> %% =========================================================================== %% =========================================================================== +unexpected(F, A, #state{service_name = Name}) -> + ?UNEXPECTED(F, A ++ [Name]). + cb([_|_] = M, F, A) -> eval(M, F, A); cb(Rec, F, A) -> |