naf 1.1.2 → 1.1.3

data/app/models/logical/naf/construction_zone/foreman.rb

@@ -8,20 +8,17 @@ module Logical::Naf::ConstructionZone
     end
 
     def enqueue(work_order)
-      limited = false
       unless work_order.enqueue_backlogs
         if limited_by_run_group?(work_order.application_run_group_restriction,
                                  work_order.application_run_group_name,
                                  work_order.application_run_group_limit)
-          limited = true
           logger.warn "work order limited by run queue limits #{work_order.inspect}"
+          return nil
         end
       end
-      unless limited
-        @proletariat.create_job(work_order.historical_job_parameters,
-                                work_order.historical_job_affinity_tab_parameters,
-                                work_order.historical_job_prerequisite_historical_jobs)
-      end
+      @proletariat.create_job(work_order.historical_job_parameters,
+                              work_order.historical_job_affinity_tab_parameters,
+                              work_order.historical_job_prerequisite_historical_jobs)
     end
 
     def limited_by_run_group?(application_run_group_restriction, application_run_group_name, application_run_group_limit)

data/app/models/process/naf/runner.rb

@@ -250,7 +250,8 @@ module Process::Naf
                 logger.warn "child pid: #{pid}, status: #{status.inspect}, not managed by this runner"
               end
             rescue ActiveRecord::ActiveRecordError => are
-              raise
+              logger.error escape_html("Failure during cleaning up of dead child with pid: #{pid}")
+              logger.error escape_html("#{are.message}")
             rescue StandardError => e
               # XXX just incase a job control failure -- more code here
               logger.error "some failure during child clean up"

data/lib/naf/version.rb

@@ -1,3 +1,3 @@
 module Naf
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/naf.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name        = "naf"
   s.version     = Naf::VERSION
   s.license     = 'New BSD License'
-  s.date        = '2013-10-14'
+  s.date        = '2013-12-12'
   s.summary     = "Creates infrastructure for a customizable and robust Postgres-backed script scheduling/running"
   s.description = "A cloud based distributed cron, application framework and operations console. Naf works as a distributed script running " +
                   "system that provides scheduling, logging, alarming, machine redundancy, and the ability to set constraint during script execution"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naf
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails