Use given messagesPerSecond parameter

droonga · Apr 14, 2015 · 6d3438f · 6d3438f
1 parent 32abafc
commit 6d3438f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/droonga/plugins/system/absorb_data.rb b/lib/droonga/plugins/system/absorb_data.rb
@@ -104,8 +104,7 @@ def dumper_params
                 :loop    => @loop,
               },
 
-              :messages_per_second => params["messagesPerSecond"] ||
-                                        DEFAULT_MESSAGES_PER_SECOND,
+              :messages_per_second => messages_per_second,
             }
           end
 
@@ -130,7 +129,7 @@ def progress_percentage
           def progress_message
             n_remaining_records = [@total_n_source_records - @n_processed_messages, 0].max
 
-            remaining_seconds  = n_remaining_records / @messages_per_second
+            remaining_seconds  = n_remaining_records / messages_per_second
             remaining_hours    = (remaining_seconds / ONE_HOUR_IN_SECONDS).floor
             remaining_seconds -= remaining_hours * ONE_HOUR_IN_SECONDS
             remaining_minutes  = (remaining_seconds / ONE_MINUTE_IN_SECONDS).floor
@@ -185,6 +184,11 @@ def source_dataset
                                   Catalog::Dataset::DEFAULT_NAME
           end
 
+          def messages_per_second
+            @messages_per_second ||= @request.request["messagesPerSecond"] ||
+                                       DEFAULT_MESSAGES_PER_SECOND
+          end
+
           def source_client_options
             {
               :host    => source_host,