fix: return threshold in status for zabbix

https://jira.railsc.ru/browse/PC4-17798

app/controllers/resque/queues/status_controller.rb

@@ -9,6 +9,10 @@ def show
             age(params['queue'])
           when 'size'
             size(params['queue'])
+          when 'size_threshold'
+            Resque.queues_info.size_threshold(params.fetch('queue'))
+          when 'age_threshold'
+            Resque.queues_info.age_threshold(params.fetch('queue'))
           else
             0
           end.to_s

lib/resque/integration/queues_info.rb

@@ -20,9 +20,7 @@ def age_overall
 
         return 0 if job.nil? || max_time.nil?
 
-        threshold = (@queues[job['queue']] || @defaults)['max_age']
-
-        max_time >= threshold ? max_time : 0
+        max_time >= age_threshold(job['queue']) ? max_time : 0
       end
 
       def size_for_queue(queue = nil)
@@ -34,17 +32,21 @@ def size_overall
           [queue, Resque.size(queue).to_i]
         end.max_by(&:last)
 
-        thresholds = (@queues[queue] || @defaults)['max_size']
+        size >= size_threshold(queue) ? size : 0
+      end
+
+      def size_threshold(queue)
+        (@queues[queue] || @defaults)['max_size']
+      end
 
-        size >= thresholds ? size : 0
+      def age_threshold(queue)
+        (@queues[queue] || @defaults)['max_age']
       end
 
       def data
         @data ||= @queues.map do |k, v|
           {
-            "{#QUEUE}" => k,
-            "{#THRESHOLD_AGE}" => v.fetch('max_age'),
-            "{#THRESHOLD_SIZE}" => v.fetch('max_size')
+            "{#QUEUE}" => k
           }
         end
       end
@@ -81,6 +83,8 @@ def expand_config(config)
           v = config.delete(key)
 
           key.split(',').each do |queue|
+            queue.chomp!
+            queue.strip!
             config[queue] = v
           end
         end

spec/resque/integration/queues_info_spec.rb

@@ -183,4 +183,40 @@
       end
     end
   end
+
+  describe '#age_threshold' do
+    context 'when queue defined in config' do
+      let(:queue_name) { 'first' }
+
+      it 'returns threshold for age' do
+        expect(queue_info.age_threshold(queue_name)).to eq 20
+      end
+    end
+
+    context 'when queue not defined in config' do
+      let(:queue_name) { 'second' }
+
+      it 'returns default threshold' do
+        expect(queue_info.age_threshold(queue_name)).to eq 10
+      end
+    end
+  end
+
+  describe '#size_threshold' do
+    context 'when queue defined in config' do
+      let(:queue_name) { 'first' }
+
+      it 'returns threshold for size' do
+        expect(queue_info.size_threshold(queue_name)).to eq 100
+      end
+    end
+
+    context 'when queue not defined in config' do
+      let(:queue_name) { 'second' }
+
+      it 'returns default threshold' do
+        expect(queue_info.size_threshold(queue_name)).to eq 10
+      end
+    end
+  end
 end