Merge pull request #80 from pietern/redis3 (f03ef3dd) · Commits · github_fork / Clip

lib/fnordmetric/event.rb

+11 −3

Original line number	Diff line number	Diff line
		@@ -9,13 +9,21 @@ module FnordMetric
		def self.all(opts)
		range_opts = { :withscores => true }
		range_opts.merge!(:limit => [0,opts[:limit]]) if opts[:limit]
		opts[:redis].zrevrangebyscore(
		events = opts[:redis].zrevrangebyscore(
		"#{opts[:namespace_prefix]}-timeline",
		'+inf', opts[:since]\|\|'0',
		range_opts
		).in_groups_of(2).map do \|event_id, ts\|
		)

		unless events.first.is_a?(Array)
		events = events.in_groups_of(2).map do \|event_id, ts\|
		[event_id, Float(ts)]
		end
		end

		events.map do \|event_id, ts\|
		next if event_id.blank?
		find(event_id, opts).tap{ \|e\| e.time = ts }
		find(event_id, opts).tap{ \|e\| e.time = "%.f" % ts }
		end
		end

lib/fnordmetric/gauge_calculations.rb

+11 −3

Original line number	Diff line number	Diff line
		@@ -47,12 +47,20 @@ module FnordMetric::GaugeCalculations

		def field_values_at(time, opts={}, &block)
		opts[:max_fields] \|\|= 50
		redis.zrevrange(
		field_values = redis.zrevrange(
		tick_key(time),
		0, opts[:max_fields]-1,
		:withscores => true
		).in_groups_of(2).map do \|key, val\|
		[key, calculate_value(val, time, opts, block)]
		)

		unless field_values.first.is_a?(Array)
		field_values = field_values.in_groups_of(2).map do \|key, val\|
		[key, Float(val)]
		end
		end

		field_values.map do \|key, val\|
		[key, calculate_value("%.f" % val, time, opts, block)]
		end
		end

lib/fnordmetric/session.rb

+9 −2

Original line number	Diff line number	Diff line
		@@ -27,8 +27,15 @@ class FnordMetric::Session
		set_key = "#{opts[:namespace_prefix]}-session"
		limit = (opts[:limit].try(:to_i)\|\|0)-1
		session_ids = opts[:redis].zrevrange(set_key, 0, limit, :withscores => true)
		session_ids.in_groups_of(2).map do \|session_key, ts\|
		find(session_key, opts).tap{ \|s\| s.updated_at = ts }

		unless session_ids.first.is_a?(Array)
		session_ids = session_ids.in_groups_of(2).map do \|session_id, ts\|
		[session_id, Float(ts)]
		end
		end

		session_ids.map do \|session_key, ts\|
		find(session_key, opts).tap{ \|s\| s.updated_at = "%.f" % ts }
		end
		end

spec/gauge_modifiers_spec.rb

+7 −7

Original line number	Diff line number	Diff line
		@@ -294,7 +294,7 @@ describe "increment three-dimensional gagues" do
		event = { :_time => @now }
		context.call(event, @redis_wrap)
		end
		@redis.zscore(gauge_key, "whoopwhoop").should == "13"
		@redis.zscore(gauge_key, "whoopwhoop").to_f.should == 13.0
		@redis.get(gauge_key+"-count").should == "1"
		end

		@@ -311,7 +311,7 @@ describe "increment three-dimensional gagues" do
		event = { :_time => @now }
		context.call(event, @redis_wrap)
		end
		@redis.zscore(gauge_key, "whoopwhoop").should == "5"
		@redis.zscore(gauge_key, "whoopwhoop").to_f.should == 5.0
		@redis.get(gauge_key+"-count").should == "7"
		end

		@@ -328,7 +328,7 @@ describe "increment three-dimensional gagues" do
		event = { :_time => @now, :myfield => "fnordybar" }
		context.call(event, @redis_wrap)
		end
		@redis.zscore(gauge_key, "fnordybar").should == "16"
		@redis.zscore(gauge_key, "fnordybar").to_f.should == 16.0
		end

		it "should increment_unique a three-dim gauge" do
		@@ -346,7 +346,7 @@ describe "increment three-dimensional gagues" do
		event = { :_time => @now, :_session_key => "mysesskey" }
		context.call(event, @redis_wrap)
		end
		@redis.zscore(gauge_key, "mykey").should == "84"
		@redis.zscore(gauge_key, "mykey").to_f.should == 84.0
		@redis.get(gauge_key+"-sessions-count").should == "6"
		@redis.smembers(gauge_key+"-sessions").should == ["mysesskey"]
		end
		@@ -367,7 +367,7 @@ describe "increment three-dimensional gagues" do
		event = { :_time => @now, :_session_key => "mysesskey" }
		context.call(event, @redis_wrap)
		end
		@redis.zscore(gauge_key, "otherkey").should == "54"
		@redis.zscore(gauge_key, "otherkey").to_f.should == 54.0
		@redis.get(gauge_key+"-sessions-count").should == "5"
		@redis.smembers(gauge_key+"-sessions").should == ["mysesskey"]
		end
		@@ -397,7 +397,7 @@ describe "increment three-dimensional gagues" do
		it "should set a value on a two-dim gauge" do
		gauge_key = "fnordmetrics-myns-gauge-mygauge_1463-10-695280200"
		@redis.zadd(gauge_key, 65, "asdasdkey")
		@redis.zscore(gauge_key, "asdasdkey").should == "65"
		@redis.zscore(gauge_key, "asdasdkey").to_f.should == 65.0
		create_gauge_context({
		:key => "mygauge_1463",
		:three_dimensional => true,
		@@ -408,7 +408,7 @@ describe "increment three-dimensional gagues" do
		event = { :_time => @now, :_session_key => "mysesskey" }
		context.call(event, @redis_wrap)
		end
		@redis.zscore(gauge_key, "asdasdkey").should == "23"
		@redis.zscore(gauge_key, "asdasdkey").to_f.should == 23.0
		end

		end

Admin message