rocketjob 6.0.3 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d37fc69678a20d2ab48a22daccbbff3238a4511d9fc711873c70640abe4b5d81
-  data.tar.gz: df5bc46066bf3359c7e75549cd75545f52fde6c4b5e6c0a4dfae0b63705ca3fe
+  metadata.gz: fc1f3d316be0aa058cee5b22c116872a80ea5bdaf7d72db447ae13781ba6b370
+  data.tar.gz: 87f56a455792e45ab2ad706f0c8bd625590df9942806bbd308c5145d07e94973
 SHA512:
-  metadata.gz: 18c563035502f1c1b9c0a37fb87f0563544ba83de0db5f7dec0ba663540a1db2a32b686cfc64c8056b99d7a3ce503b508ab206270feb277c42e79ca010debdf7
-  data.tar.gz: 71e00ec619377e422934ae0682b4322ffea63b3db307c06ab4a33a2e24fa149f599a9a579ab3b4d699cf5684d296d861b1cbbf2abc802b55002e721e35d4070e
+  metadata.gz: f928a3afb886c39893ef5b5d2e13f71405c83df53c3b02826e474326c9171f87c84e595fc179a0e22cbc69d846f1da12eb268026fc06bcaf609920326159c6f4
+  data.tar.gz: 3b90508c45e7a09739ae53e5bb66992d80251a5b5668eb568eeba30a8da8d109bbb162b2db66e93f82ce3deb4f6cc9425175d0f9c41adb351f6c3885768db3dc

data/lib/rocket_job/dirmon_entry.rb

@@ -71,6 +71,7 @@ module RocketJob
     validates_presence_of :pattern, :job_class_name, :archive_directory
     validate :job_is_a_rocket_job
     validate :job_has_properties
+    validates_uniqueness_of :pattern, :name
 
     # State Machine events and transitions
     #
@@ -97,6 +98,7 @@ module RocketJob
       event :enable do
         transitions from: :pending, to: :enabled
         transitions from: :disabled, to: :enabled
+        transitions from: :failed, to: :enabled
       end
 
       event :disable do

data/lib/rocket_job/jobs/dirmon_job.rb

@@ -59,23 +59,31 @@ module RocketJob
       def check_directories
         new_file_names = {}
         DirmonEntry.enabled.each do |dirmon_entry|
-          dirmon_entry.each do |path|
-            # Skip file size checking since S3 files are only visible once completely uploaded.
-            unless path.partial_files_visible?
-              logger.info("File: #{path}. Starting: #{dirmon_entry.job_class_name}")
-              dirmon_entry.later(path)
-              next
-            end
+          check_entry(dirmon_entry, new_file_names)
+        end
+        self.previous_file_names = new_file_names
+      end
 
-            # BSON Keys cannot contain periods
-            key           = path.to_s.tr(".", "_")
-            previous_size = previous_file_names[key]
-            # Check every few minutes for a file size change before trying to process the file.
-            size                = check_file(dirmon_entry, path, previous_size)
-            new_file_names[key] = size if size
+      def check_entry(dirmon_entry, file_names)
+        dirmon_entry.each do |path|
+          # Skip file size checking since S3 files are only visible once completely uploaded.
+          unless path.partial_files_visible?
+            logger.info("File: #{path}. Starting: #{dirmon_entry.job_class_name}")
+            dirmon_entry.later(path)
+            next
           end
+
+          # BSON Keys cannot contain periods
+          key           = path.to_s.tr(".", "_")
+          previous_size = previous_file_names[key]
+          # Check every few minutes for a file size change before trying to process the file.
+          size            = check_file(dirmon_entry, path, previous_size)
+          file_names[key] = size if size
         end
-        self.previous_file_names = new_file_names
+      rescue StandardError => e
+        logger.error("Dirmon Entry: #{dirmon_entry.id} failed. Moved to `failed` state to prevent processing again without manual intervention.", e)
+        dirmon_entry.fail(worker_name, e)
+        dirmon_entry.save(validate: false)
       end
 
       # Checks if a file should result in starting a job

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob
-  VERSION = "6.0.3".freeze
+  VERSION = "6.1.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.0
 platform: ruby
 authors:
 - Reid Morrison