Commit 753f9013 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

oops (2)

parent 2430ecdc
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -75,10 +75,10 @@ module FnordMetric::GaugeCalculations
    (sync_redis.get(tick_key(time, :count))||0).to_i
  end

  def fraction_values_in(range)
  def fraction_values_in(range, _append=nil)
    Hash.new{ |h,k| h[k] = [0,0] }.tap do |vals|
      ticks_in(range, retention).each do |_tick|
        sync_redis.hgetall(retention_key(_tick)).each do |k, v|
        sync_redis.hgetall(retention_key(_tick, _append)).each do |k, v|
          kx = k.split("-")
          vals[kx.first.to_i][kx.last == "denominator" ? 1 : 0] += v.to_f
        end
+2 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ module FnordMetric::GaugeModifiers
      raise "FIXPAUL: not yet implemented: progressive fraction gauges"
    end

    ctx.redis_exec(:hincrby, retention_key(at), "#{tick_at(at)}-#{part}", value).callback do 
      ctx.redis_exec :expire,  retention_key(at)
    ctx.redis_exec(:hincrby, retention_key(at, series_name), "#{tick_at(at)}-#{part}", value).callback do 
      ctx.redis_exec :expire,  retention_key(at, series_name)
    end
  end
  
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class FnordMetric::TimeseriesGauge < FnordMetric::Gauge
    @opts[:series].each do |series|
      ts = FnordMetric::Timeseries.new

      fraction_values_in(interval).each do |time, frac|
      fraction_values_in(interval, series).each do |time, frac|
        ts.incr_fraction(time, *frac)
      end