iyyov 1.1.3-java → 1.1.4-java

data/History.rdoc

@@ -1,7 +1,15 @@
+=== 1.1.4 (2012-9-15)
+* Upgrade/broaden to slf4j [1.6.5,1.8), logback ~> 1.2
+* Only stop old daemons when either (a) they are no longer in the
+  newly configured context, or (b) with exec_key changed and a passing
+  pre_check. This avoids an install failure from terminating a
+  functional (older) version.
+* Call super in Context.initialize, for better support of late mixins.
+
 === 1.1.3 (2012-1-15)
 * Add task on call to block for log access, etc.
 * Fix handling of Gem::LoadError on reload of jobs.rb extended with a
-  daemon who's gem is not currently installed. Previously this was
+  daemon who's gem is not currently installed. Previously this was a
   fatal error.
 * Upgrade to tarpit ~> 2.0, bundler Gemfile, gemspec (build)
 

data/init/iyyov

@@ -24,7 +24,7 @@
 
 require 'rubygems'
 
-gem( "iyyov", "= 1.1.3" )
+gem( "iyyov", "= 1.1.4" )
 
 require 'rjack-logback'
 RJack::Logback.config_console( :full => true, :thread => true )

data/lib/iyyov.rb

@@ -57,11 +57,16 @@ module Iyyov
 
     if old_context
       if all_success
-        # Stop old daemons that are no longer in the newly configured
-        # context, or who's exec_key has changed
+        # Stop old daemons that are either:
+        # - no longer in the newly configured context, OR:
+        # - with exec_key changed AND a passing pre_check
         old_context.daemons.each do |name,odaemon|
           ndaemon = @context.daemons[name]
-          odaemon.stop unless ndaemon && ndaemon.exec_key == odaemon.exec_key
+          if ( ndaemon.nil? ||
+               ( ndaemon.pre_check &&
+                 ( ndaemon.exec_key != odaemon.exec_key ) ) )
+            odaemon.stop
+          end
         end
       else
         @context = old_context

data/lib/iyyov/base.rb

@@ -16,5 +16,5 @@
 
 module Iyyov
   # Iyyov version
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/lib/iyyov/context.rb

@@ -56,6 +56,8 @@ module Iyyov
     attr_reader   :daemons
 
     def initialize
+      super
+
       @base_dir     = "/opt/var"
       @make_run_dir = true
       @stop_on_exit = false

data/lib/iyyov/daemon.rb

@@ -261,6 +261,19 @@ module Iyyov
       false
     end
 
+    # Return true if passes initial checks for start. This includes
+    # gem availability and/or if the exe_path is executable,
+    # i.e. everything that can be checked *before* starting.
+    def pre_check
+      epath = File.expand_path( exe_path )
+      is_exec = File.executable?( epath )
+      @log.warn( "#{epath} is not executable" ) unless is_exec
+      is_exec
+    rescue Gem::LoadError, Gem::GemNotFoundException, Errno::ENOENT => e
+      @log.warn( e.to_s )
+      false
+    end
+
     # Return array suitable for comparing this daemon with prior
     # running instance.
     def exec_key

metadata

@@ -2,7 +2,7 @@
 name: iyyov
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.3
+  version: 1.1.4
 platform: java
 authors: 
   - David Kellum
@@ -10,16 +10,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 Z
+date: 2012-09-15 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rjack-slf4j
     version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.6.5
+        - - <
           - !ruby/object:Gem::Version 
-            version: 1.6.1
+            version: "1.8"
     requirement: *id001
     prerelease: false
     type: :runtime
@@ -30,7 +33,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: "1.1"
+            version: "1.2"
     requirement: *id002
     prerelease: false
     type: :runtime
@@ -146,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Down-to-earth job control and monitoring.