YUKI Hiroshi
null+****@clear*****
Fri Apr 17 22:37:15 JST 2015
YUKI Hiroshi 2015-04-17 22:37:15 +0900 (Fri, 17 Apr 2015) New Revision: c08c31a011e09e3c8c5b0855b5441d30829710d4 https://github.com/droonga/drndump/commit/c08c31a011e09e3c8c5b0855b5441d30829710d4 Message: Avoid zero divide error when the now time is same to previous time Modified files: lib/drndump/dump_client.rb Modified: lib/drndump/dump_client.rb (+9 -2) =================================================================== --- lib/drndump/dump_client.rb 2015-04-17 22:36:40 +0900 (b89172b) +++ lib/drndump/dump_client.rb 2015-04-17 22:37:15 +0900 (25ccc9f) @@ -145,6 +145,7 @@ module Drndump def recent_throughput now = Time.now n_messages = @n_received_messages - @previous_n_received_messages + if now - @previous_measure_time < 1 now = @previous_measure_time n_messages = @previous_n_received_messages @@ -152,9 +153,15 @@ module Drndump @previous_measure_time = now @previous_n_received_messages = n_messages.to_f end - elapsed_seconds = now - @measure_start_time - [n_messages / elapsed_seconds, MIN_REPORTED_THROUGHPUT].max + if now == @measure_start_time + actual_throughput = 0 + else + elapsed_seconds = now - @measure_start_time + actual_throughput = n_messages / elapsed_seconds + end + + [actual_throughput, MIN_REPORTED_THROUGHPUT].max end def n_remaining_messages -------------- next part -------------- HTML����������������������������...ダウンロード