fix: использоание параметров по умолчанию

abak-press · Sep 4, 2017 · 949023c · 949023c
1 parent 6ae1c1f
commit 949023c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/resque/integration/queues_info/config.rb b/lib/resque/integration/queues_info/config.rb
@@ -43,7 +43,7 @@ def data
         private
 
         def threshold(queue, param)
-          (@queues[queue] || @defaults)[param]
+          @queues[queue].try(:[], param) || @defaults[param]
         end
 
         def load_config(path)

diff --git a/spec/resque/integration/queues_info_spec.rb b/spec/resque/integration/queues_info_spec.rb
@@ -354,18 +354,18 @@
         },
         {
           '{#QUEUE}' => 'second_queue',
-          '{#THRESHOLD_AGE}' => nil,
-          '{#THRESHOLD_SIZE}' => nil,
-          '{#THRESHOLD_FAILURES_PER_5M}' => nil,
-          '{#THRESHOLD_FAILURES_PER_1H}' => nil,
+          '{#THRESHOLD_AGE}' => 10,
+          '{#THRESHOLD_SIZE}' => 10,
+          '{#THRESHOLD_FAILURES_PER_5M}' => 5,
+          '{#THRESHOLD_FAILURES_PER_1H}' => 60,
           '{#CHANNEL}' => 'first second'
         },
         {
           '{#QUEUE}' => 'without_channel',
-          '{#THRESHOLD_AGE}' => nil,
-          '{#THRESHOLD_SIZE}' => nil,
-          '{#THRESHOLD_FAILURES_PER_5M}' => nil,
-          '{#THRESHOLD_FAILURES_PER_1H}' => nil,
+          '{#THRESHOLD_AGE}' => 10,
+          '{#THRESHOLD_SIZE}' => 10,
+          '{#THRESHOLD_FAILURES_PER_5M}' => 5,
+          '{#THRESHOLD_FAILURES_PER_1H}' => 60,
           '{#CHANNEL}' => 'default'
         }
       ]