Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/riak_core_capability.erl
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ register(Capability, Supported, Default, LegacyVar) ->
register(Capability, Supported, Default) ->
register(Capability, Supported, Default, undefined).


%% @doc Query the current negotiated mode for a given capability, throwing an
%% exception if the capability is unknown or the capability system is
%% unavailable.
Expand Down
4 changes: 2 additions & 2 deletions src/riak_core_tracer.erl
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ handle_call({filter, MFs, Filter}, _From, State) ->
handle_call({collect, Duration, Nodes}, _From, State) ->
cancel_timer(State#state.stop_tref),
Tref = timer:send_after(Duration, collect_timeout),
dbg:stop_clear(),
dbg:stop(),
dbg:tracer(process, {fun ({trace, _, call, {?MODULE, trigger_sentinel, _}}, Pid) ->
gen_server:cast(Pid, stop_sentinel),
Pid;
Expand Down Expand Up @@ -161,7 +161,7 @@ handle_call(stop, _From, State) ->
{stop, normal, ok, State}.

handle_cast(stop_sentinel, State) ->
dbg:stop_clear(),
dbg:stop(),
case State#state.stop_from of
undefined ->
ok;
Expand Down