Permalink
Browse files

Merge branch '1.3'

Conflicts:
	rebar.config
  • Loading branch information...
2 parents 30e61d6 + b888d66 commit 7d8e638cf1e5da44e440df6c7c58d0ea95936d52 Jared Morrow committed Mar 25, 2013
Showing with 6 additions and 3 deletions.
  1. +1 −1 src/riak_pipe.app.src
  2. +5 −2 src/riak_pipe_stat.erl
View
@@ -1,7 +1,7 @@
{application, riak_pipe,
[
{description, "Riak Pipeline"},
- {vsn, "1.3.0"},
+ {vsn, "1.3.1"},
{registered, []},
{applications, [
kernel,
View
@@ -46,8 +46,11 @@ start_link() ->
gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
register_stats() ->
- [(catch folsom_metrics:delete_metric({?APP, Name})) || {Name, _Type} <- stats()],
- [register_stat(stat_name(Stat), Type) || {Stat, Type} <- stats()],
+ [begin
+ StatName = stat_name(Name),
+ (catch folsom_metrics:delete_metric(StatName)),
+ register_stat(StatName, Type)
+ end || {Name, Type} <- stats()],
riak_core_stat_cache:register_app(?APP, {?MODULE, produce_stats, []}).
%% @doc Return current aggregation of all stats.

0 comments on commit 7d8e638

Please sign in to comment.