rabbit-wq 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8146dc0247a3db1e510b8c6205e8ede3892667a
-  data.tar.gz: f141d450c09d9b0a925ce0f398f45aadfd1430f5
+  metadata.gz: 7eda05e56f6f09a461248b06fe4bbe469b47dd90
+  data.tar.gz: 3c0ee3b6a1e34c86af956ca37f81a8818e213e6a
 SHA512:
-  metadata.gz: 7f62f6087f74838fb3b4b3f02a63c1e36663a714f192731203dafabc6f86c506d488fd43f14c270f1893094da87462aed35202592c07ca63d46708d3b80fde6d
-  data.tar.gz: 76bdc1c54aba7299d5b7ba993b5fe5782bd508e8e7450a915f226c3c91938a20974596b55ec5d3a0ce4390426b89161985c7318644964e1b1f0c7056b0efbad6
+  metadata.gz: 4d33b58e75749d71fce83a5d6207855c9eb2bd1fb36f1173c7cd33a677221575c801a9cfa421caa10330cf40e3f49008f33b1763a429824a1b46fe62a33bdb01
+  data.tar.gz: 535e7ae18704a338b64a80a3d5635b5251e9a655edf83e6747cfefd33ec2fd8ce7cafa8daff587e89b01af32c4ed70a44ddff2fec56f6f9763b6d391f735bc75

data/README.md

@@ -213,6 +213,14 @@ Here is an example configuration file with each option's default value:
       "work_log_path": "/var/log/rabbit-wq/rabbit-wq-work.log",
       "work_publish_queue": "work"
       "work_subscribe_queue": "work"
+      "ignored_workers": {
+        "to_error_queue": [
+          "Some::Worker"
+        ],
+        "trash": [
+          "Some::OtherWorker"
+        ]
+      }
     }
 
 #### Options
@@ -232,6 +240,12 @@ The environment to run in.  Defaults to production.
 #####error_queue
 The name of the error queue. Defaults to error.
 
+#####ignored_workers/to_error_queue
+List of workers to ignore.  Will add directly to error_queue without obeying retires, etc.
+
+#####ignored_workers/trash
+List of workers to ignore.  Trashes the worker without error or complaining.
+
 #####threads
 The size of the thread pool.  Can be overridden with the command line option --threads or -t.  Defaults to 1.
 

data/lib/rabbit_wq/configuration.rb

@@ -24,5 +24,15 @@ module RabbitWQ
       }
     end
 
+    def ignored_workers_to_error_queue
+      return [] unless ignored_workers
+      Array( ignored_workers.to_error_queue )
+    end
+
+    def ignored_workers_trash
+      return [] unless ignored_workers
+      Array( ignored_workers.trash )
+    end
+
   end
 end

data/lib/rabbit_wq/message_handler.rb

@@ -44,11 +44,22 @@ module RabbitWQ
     end
 
     def handle_work( worker, payload )
+      if ignore_and_trash?( worker )
+        info "Trashed: #{worker.class.name}:#{worker.object_id}"
+        return
+      end
+
+      if ignore_and_error?( worker )
+        info "Ignored and sent to error queue: #{worker.class.name}:#{worker.object_id}"
+        Work.enqueue_error_payload( payload, error: "Worker ignored" )
+        return
+      end
+
       unless worker.enabled?
+        worker_info( worker, "Worker disabled" )
         if worker.error_on_disabled?
           Work.enqueue_error_payload( payload, error: "Worker disabled" )
         end
-        worker_info( worker, "Worker disabled" )
         return
       end
 
@@ -124,6 +135,18 @@ module RabbitWQ
       channel.reject delivery_info.delivery_tag, REQUEUE
     end
 
+    def ignore_and_trash?( worker )
+      config.ignored_workers_trash.include?( worker.class.name )
+    end
+
+    def ignore_and_error?( worker )
+      config.ignored_workers_to_error_queue.include?( worker.class.name )
+    end
+
+    def config
+      Servitude.configuration
+    end
+
     def retry_delays( retry_num )
       {
         1 => 1,

data/lib/rabbit_wq/version.rb

@@ -1,3 +1,3 @@
 module RabbitWQ
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/rabbit-wq.conf.example

@@ -0,0 +1,23 @@
+{
+  "delayed_exchange_prefix": "work-delay",
+  "delayed_queue_prefix": "work-delay",
+  "environment_file_path": "/some/path/to/environment/file"",
+  "env": "development",
+  "error_queue": "error",
+  "threads": 1,
+  "time_zone": "UTC",
+  "work_exchange": "work",
+  "work_exchange_type": "fanout",
+  "work_log_level": "debug",
+  "work_log_path": "/var/log/ncite/work.log",
+  "work_publish_queue": "work",
+  "work_subscribe_queue": "work-repo",
+  "ignored_workers": {
+    "to_error_queue": [
+      "Some::Worker"
+    ],
+    "trash": [
+      "Some::OtherWorker"
+    ]
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit-wq
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - C. Jason Harrelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,7 @@ files:
 - lib/rabbit_wq/work_logger.rb
 - lib/rabbit_wq/work_logging.rb
 - lib/rabbit_wq/worker.rb
+- rabbit-wq.conf.example
 - rabbit-wq.gemspec
 homepage: ''
 licenses: