Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 6 commits
  • 3 files changed
  • 0 commit comments
  • 4 contributors
Commits on Mar 10, 2013
@cmeiklejohn Fix bad tag that causes doc generation to fail. 136af31
Commits on Mar 11, 2013
@beerriot beerriot Merge pull request 69 from branch 'cmeiklejohn/csm-fix-doc-generation' 30e61d6
Commits on Mar 19, 2013
@russelldb russelldb Fix stat names so delete of stats on restart works
Folsom can get inconsistent. When it does stat updates will fail.
When a stat update fails the stat server crashes. Deleting on
start up is a way to get folsom consistent again.

This commit fixes a bug where the pipe stats were not all
deleted due to using the wrong stat name format.
d87fa23
Commits on Mar 21, 2013
@russelldb russelldb Merge pull request #70 from basho/kv508-crashed-stats
Fix stat names so delete of stats on restart works
293f190
Commits on Mar 23, 2013
@jaredmorrow jaredmorrow Roll riak_pipe version 1.3.1 b888d66
Commits on Mar 25, 2013
@jaredmorrow jaredmorrow Merge branch '1.3'
Conflicts:
	rebar.config
7d8e638
View
2  src/riak_pipe.app.src
@@ -1,7 +1,7 @@
{application, riak_pipe,
[
{description, "Riak Pipeline"},
- {vsn, "1.3.0"},
+ {vsn, "1.3.1"},
{registered, []},
{applications, [
kernel,
View
2  src/riak_pipe.erl
@@ -154,7 +154,7 @@
%% sink (all output, logging, and trace messages). If specified,
%% `Sink' should be a `#fitting{}' record, filled with the pid of
%% the process prepared to receive these messages.
-%%</dd<dt>
+%%</dd><dt>
%% `{sink_type, Type}'
%%</dt><dd>
%% Specifies the way in which messages are delivered to the
View
7 src/riak_pipe_stat.erl
@@ -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.

No commit comments for this range

Something went wrong with that request. Please try again.