simple_job 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c017adc129ac7a434ceabc18789ffa3961e7a13
-  data.tar.gz: 4a7f812e0810ca90604bb300a10b43f31c019116
+  metadata.gz: 8c0ac22cadc2b8b7c0544f2bc924e6138f48e3de
+  data.tar.gz: b81dc251dfd39a7c197cae41c76c0fae6bdd5912
 SHA512:
-  metadata.gz: 0a6c69686ed7cebc1ba2531a2df856d6f9f154181b1eeb3ff82b82e5f528df3e44b7fd3a6b07d24398b8958a35f4dbb6091fe5a5a0046a23dada6d060ee19a3a
-  data.tar.gz: 9f75a0b951dfd8b9d72c490ae40aeff1a2871e723a9e98ce81702203afe563f6592c76dd7318d41a2123b2a7219c396827f652d47860e0c879255459b47d0c82
+  metadata.gz: 0d4689fc521101f7e25b875a838c9182adc37d9119e5f0cd1b48f672b26f35a316ed610cad5864a80e2f6d548421a7d68e9e907b770c73aff96d33b540a4ff54
+  data.tar.gz: 0b8cdd8803a6c3f4b92e3a723488d25d2c1fbf226770b99ee63535d87795fc82e66b01f1c56d093c6b76dad8a342b1877f00c50f557346d1fc2c1defc82850e8

data/CHANGELOG.rdoc

@@ -1,5 +1,8 @@
 = Simple Job
 
+== Version 0.12.1
+* Ignoring messages that don't look like valid job definitions
+
 == Version 0.12.0
 * Added accept_nested_definition option to SQSJobQueue
 * Updating specs and eliminating their dependency on AWS

data/lib/simple_job/sqs_job_queue.rb

@@ -172,24 +172,29 @@ class SQSJobQueue < JobQueue
       begin
         sqs_queue.receive_messages(options) do |message|
           message_body = get_message_body(message)
-          last_message = message
-          last_message_at = Time.now
           raw_message = JSON.parse(message_body)
-          current_job_type = raw_message['type']
-          definition_class = JobDefinition.job_definition_class_for(raw_message['type'], raw_message['version'])
 
-          raise('no definition found') if !definition_class
+          if raw_message['type'] && raw_message['version']
+            last_message = message
+            last_message_at = Time.now
+            current_job_type = raw_message['type']
+            definition_class = JobDefinition.job_definition_class_for(raw_message['type'], raw_message['version'])
 
-          if definition_class.max_attempt_count && (message.receive_count > definition_class.max_attempt_count)
-            raise('max attempt count reached') 
-          end
+            raise('no definition found') if !definition_class
+
+            if definition_class.max_attempt_count && (message.receive_count > definition_class.max_attempt_count)
+              raise('max attempt count reached') 
+            end
 
-          definition = definition_class.new.from_json(message_body)
-          last_definition = definition
+            definition = definition_class.new.from_json(message_body)
+            last_definition = definition
 
-          # NOTE: only executes if asynchronous_execute is false (message will be re-enqueued after
-          # vis. timeout if this fails or runs too long)
-          message_handler.call(definition, message) unless asynchronous_execute
+            # NOTE: only executes if asynchronous_execute is false (message will be re-enqueued after
+            # vis. timeout if this fails or runs too long)
+            message_handler.call(definition, message) unless asynchronous_execute
+          else
+            logger.info("ignoring invalid message: #{message_body}")
+          end
         end
 
         # NOTE: only executes if asynchronous_execute is set (after message has been confirmed)
@@ -378,7 +383,7 @@ class SQSJobQueue < JobQueue
       result = message_hash[accept_nested_definition]
     end
 
-    result
+    result || '{}'
   end
 
 end

data/lib/simple_job/version.rb

@@ -1,3 +1,3 @@
 module SimpleJob
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_job
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - David Dawson
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Support classes and modules for executable jobs.