Merge remote-tracking branch 'origin/bug/from-bp-request-error' into mra/write-once-clean

This commit is contained in:
Mark Allen 2015-10-07 23:02:03 -05:00
commit 679046600f
2 changed files with 8 additions and 1 deletions

View file

@ -185,7 +185,7 @@ handle_info({adjust_down_list, FLU}, #state{active_unfit=ActiveUnfit}=S) ->
handle_info(dump, #state{my_flu_name=MyFluName,active_unfit=ActiveUnfit,
pending_map=Map}=S) ->
%% io:format(user, "DUMP: ~w/~w: ~p ~W\n", [MyFluName, self(), ActiveUnfit, map_value(Map), 13]),
%io:format(user, "DUMP ~w: ~w, ", [MyFluName, ActiveUnfit]),
%% io:format(user, "DUMP ~w: ~w, ", [MyFluName, ActiveUnfit]),
{noreply, S};
handle_info(_Info, S) ->
{noreply, S}.

View file

@ -190,10 +190,17 @@ from_pb_request(_Else) ->
from_pb_response(#mpb_ll_response{
req_id=ReqID,
% There is no separate LL error response record
generic=#mpb_errorresp{code=Code, msg=Msg}}) ->
{ReqID, {error, {Code, Msg}}};
from_pb_response(#mpb_ll_response{
req_id=ReqID,
% There is no separate LL echo response record
echo=#mpb_echoresp{message=Msg}}) ->
{ReqID, Msg};
from_pb_response(#mpb_ll_response{
req_id=ReqID,
% There is no separate LL auth response record
auth=#mpb_authresp{code=Code}}) ->
{ReqID, Code};
from_pb_response(#mpb_ll_response{