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_reg.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_reg.erl')
| -rw-r--r-- | lib/diameter/src/app/diameter_reg.erl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/diameter/src/app/diameter_reg.erl b/lib/diameter/src/app/diameter_reg.erl index 8e5f34c2c3..882b9da238 100644 --- a/lib/diameter/src/app/diameter_reg.erl +++ b/lib/diameter/src/app/diameter_reg.erl @@ -243,7 +243,8 @@ handle_call(state, _, State) -> handle_call(uptime, _, #state{id = Time} = State) -> {reply, diameter_lib:now_diff(Time), State}; -handle_call(_Req, _From, State) -> +handle_call(Req, From, State) -> + ?UNEXPECTED([Req, From]), {reply, nok, State}. %%% ---------------------------------------------------------- @@ -251,7 +252,7 @@ handle_call(_Req, _From, State) -> %%% ---------------------------------------------------------- handle_cast(Msg, State)-> - warning_msg("received unexpected message:~n~w", [Msg]), + ?UNEXPECTED([Msg]), {noreply, State}. %%% ---------------------------------------------------------- @@ -264,7 +265,7 @@ handle_info({'DOWN', MRef, process, Pid, _}, State) -> {noreply, State}; handle_info(Info, State) -> - warning_msg("received unknown info:~n~w", [Info]), + ?UNEXPECTED([Info]), {noreply, State}. %%% ---------------------------------------------------------- @@ -324,8 +325,3 @@ repl([], _, _) -> call(Request) -> gen_server:call(?SERVER, Request, infinity). - -%% warning_msg/2 - -warning_msg(F, A) -> - ?diameter_warning("~p: " ++ F, [?MODULE | A]). |