Merge branch 'rdb-spiraltime' of github.com:basho/folsom into rdb-spi…

…raltime
basho · Jul 5, 2012 · 3352579 · 3352579
2 parents 204af5b + a2dd4a1
commit 3352579
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/folsom_metrics_meter.erl b/src/folsom_metrics_meter.erl
@@ -52,7 +52,7 @@ new(Name) ->
                {Name, #meter{one = OneMin,
                              five = FiveMin,
                              fifteen = FifteenMin,
-                             start_time = folsom_utils:now_epoch_micro()}}).
+                             start_time = folsom_utils:now_epoch()}}).
 
 tick(Name) ->
     #meter{one = OneMin,
@@ -129,7 +129,7 @@ get_value(Name) ->
 calc_mean_rate(_, 0) ->
     0.0;
 calc_mean_rate(Start, Count) ->
-    Elapsed = folsom_utils:now_epoch_micro() - Start,
+    Elapsed = folsom_utils:now_epoch() - Start,
     Count / Elapsed.
 
 calc_acceleration(Rate1, Rate2, Interval) ->