lib/worker_army/base.rb in worker-army-0.4.0 vs lib/worker_army/base.rb in worker-army-0.4.1

@@ -13,10 +13,13 @@
             config['worker_retry_count'] = ENV['worker_army_worker_retry_count'].to_i
           end
           if ENV['worker_army_client_retry_count']
             config['client_retry_count'] = ENV['worker_army_client_retry_count'].to_i
           end
+          if ENV['worker_army_callback_retry_count']
+            config['callback_retry_count'] = ENV['worker_army_callback_retry_count'].to_i
+          end
           if ENV['worker_army_endpoint']
             config['endpoint'] = ENV['worker_army_endpoint']
           end
         else
           begin
@@ -25,9 +28,39 @@
           rescue Errno::ENOENT
             raise "worker-army configuration expected in ~/.worker_army.yml or provide env vars..."
           end
         end
         config
+      end
+      
+      def client_retry_count(conf = nil)
+        if ENV['worker_army_client_retry_count']
+          return ENV['worker_army_client_retry_count'].to_i
+        elsif conf and conf['client_retry_count']
+          return conf['client_retry_count'].to_i
+        else
+          return 10
+        end
+      end
+    end
+
+    def worker_retry_count(conf = nil)
+      if ENV['worker_army_worker_retry_count']
+        return ENV['worker_army_worker_retry_count'].to_i
+      elsif conf and conf['worker_retry_count']
+        return conf['worker_retry_count'].to_i
+      else
+        return 10
+      end
+    end
+
+    def callback_retry_count(conf = nil)
+      if ENV['worker_army_callback_retry_count']
+        return ENV['worker_army_callback_retry_count'].to_i
+      elsif conf and conf['callback_retry_count']
+        return conf['callback_retry_count'].to_i
+      else
+        return 3
       end
     end  
   end
 end