greg/machi
1
0
Fork 0
Code Issues 11 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Avoid putting inner_summary in dbg proplist

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-07-10 17:03:22 +09:00
parent 4d41c59e19
commit ed7dcd14db
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/machi_chain_manager1.erl
View file

@ -975,12 +975,12 @@ react_to_env_A30(Retries, P_latest, LatestUnanimousP, _ReadExtra,
P_inner2 = machi_projection:update_checksum( P_inner2 = machi_projection:update_checksum(
P_inner#projection_v1{epoch_number=FinalInnerEpoch, P_inner#projection_v1{epoch_number=FinalInnerEpoch,
creation_time=FinalCreation}), creation_time=FinalCreation}),
InnerInfo = [{inner_summary, InnerInfo = [],
machi_projection:make_summary(P_inner2)}], ?REACT({a30, ?LINE, [{inner_summary,
DbgX = replace(P_newprop3#projection_v1.dbg, InnerInfo), machi_projection:make_summary(P_inner2)}]}),
?REACT({a30, ?LINE, DbgX}), P_newprop4 = machi_projection:update_checksum(
{P_newprop3#projection_v1{dbg=DbgX, P_newprop3#projection_v1{inner=P_inner2}),
inner=P_inner2}, S_i}; {P_newprop4, S_i};
{_, P_newprop3_flap_count} -> {_, P_newprop3_flap_count} ->
?REACT({a30, ?LINE,[{newprop3_flap_count,P_newprop3_flap_count}, ?REACT({a30, ?LINE,[{newprop3_flap_count,P_newprop3_flap_count},
{flap_limit, FlapLimit}]}), {flap_limit, FlapLimit}]}),

11
src/machi_projection.erl
View file

@ -147,10 +147,17 @@ make_summary(#projection_v1{epoch_number=EpochNum,
author_server=Author, author_server=Author,
upi=UPI_list, upi=UPI_list,
repairing=Repairing_list, repairing=Repairing_list,
inner=Inner,
dbg=Dbg, dbg2=Dbg2}) -> dbg=Dbg, dbg2=Dbg2}) ->
InnerInfo = if is_record(Inner, projection_v1) ->
[{inner, make_summary(Inner)}];
true ->
[]
end,
[{epoch,EpochNum},{author,Author}, [{epoch,EpochNum},{author,Author},
{upi,UPI_list},{repair,Repairing_list},{down,Down_list}, {upi,UPI_list},{repair,Repairing_list},{down,Down_list}] ++
{d,Dbg}, {d2,Dbg2}]. InnerInfo ++
[{d,Dbg}, {d2,Dbg2}].
%% @doc Make a `p_srvr_dict()' out of a list of `p_srvr()' or out of a %% @doc Make a `p_srvr_dict()' out of a list of `p_srvr()' or out of a
%% `p_srvr_dict()'. %% `p_srvr_dict()'.