omf_rc_shm 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGJmYzJiN2IzNjQ4YzFjMzdjNDNiYzM3YWE2NWI0YmFiMmIxY2Q1NA==
+    MzM2N2U2OTlhYmM5Y2MwNzYzYTNjYTJjNTY5YTNiYzZjZjdhMzYzZQ==
   data.tar.gz: !binary |-
-    ZTM3ZTI1ZTZlMjIyODg0ZmE2MTg0ZGRjZjExZjBjMGU3ZDEzNTQwYg==
+    ODFlNDQyMGMxOGM4MzU4NDYyYTMzZjA3NDA0MjRjM2Q4MjYxZDMwNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTYwZTJkYzRmYTI0NmQ1MzEyYjA4YTMyMGVmZjA2YzNmMWU2OTJjMmI1Mjdl
-    ODA3YjBmMTQwYzAyZWE5ZmFhYzI2YmNmMzgzZjIwM2E5ZGFjNGMxMzdlYjJi
-    MjA2ZGIzYjA2ZWUzOGM0ODg1YjI0NTRkYjM5NTJiNThiMWFmOTI=
+    ZTc5ZDIyNjA4NjMzYWJlMjJjZjExMDViZGY3YzhlNzM0OTVhZDk1OTc4MDQy
+    ZGZkMTcyMGRlNzM4ODY0ZjczNzU4MjAxMGU0ZWZlYzM0Y2FhYzNiYWM0ZTg5
+    Mjg5NTU3ZGQ5OWZmZTMwMjI0ZDM5ODNlYzlhMTE3ZmYwNDM1ZjE=
   data.tar.gz: !binary |-
-    MThkNzZmMGY5MDIwY2M1NjQwNzAxY2RmMDdiMzViYmIzYzZjZGVmNDg4ODRl
-    MDY3OGRkYzQ3ZDkxYWU0NjFmMzgxMTI1OWY0ZWE3YmJhNDJiMTIxNWY1NjM0
-    YzA5YzQ4MmY5NDgwZTc1NDk0ZmFmOTE2YmY5MjRmYmQ2MzU4Nzk=
+    MjVmZGUxZjk1NDNiYjIyNTgzYzdlOGIyOGM3YjcxZDEwNzY5MTI4ZDkyMzVh
+    YjkzMWUwODc5Yzg1OGJmOTg4MWY5OGYxZGFiNWYwNDczMzA2NmFiZGY5NGJl
+    ZTM1OTVkNzMxNjk0MTI0M2Y1ZDA4OGY5M2I3ZDk4ZTk1ZWFiMjE=

data/bin/cronjob_app_wrapper

@@ -13,7 +13,10 @@ if timeout && timeout.to_i > 0
   end
 end
 
-Process.waitpid(pid)
-
-`echo Process #{pid} exited with code: #{$?.exitstatus} >> #{stderr_f}`
+p_id, p_status = Process.waitpid2(pid)
 
+if p_status.exitstatus
+  `echo Process #{p_id} #{cmd} exited with status: #{p_status.exitstatus} >> #{stderr_f}`
+elsif p_status.signaled?
+  `echo Process #{p_id} #{cmd} killed by signal: #{p_status.termsig} >> #{stderr_f}`
+end

data/config/rc.yml.sample

@@ -7,10 +7,11 @@
 :resources:
 - :type: shm_node
   :uid: <%= Socket.gethostname %>
-    :app_definition_file: path_to_your_app_definition_file
+  :app_definition_file: path_to_your_app_definition_file
+  :ruby_path: <full_path_to_ruby>
 
-    :add_default_factories: false # Not loading default type factories
+:add_default_factories: false # Not loading default type factories
 
-    :factories: # Additional resources which can be created by this RC
-    - :require: omf_rc_shm
+:factories: # Additional resources which can be created by this RC
+- :require: omf_rc_shm
 

data/lib/omf_rc/resource_proxy/scheduled_application.rb

@@ -328,6 +328,7 @@ module OmfRc::ResourceProxy::ScheduledApplication
         app_wrapper_path = File.expand_path("#{File.dirname(__FILE__)}/../../../bin/cronjob_app_wrapper")
 
         cmd = "#{app_wrapper_path} #{stdout_file} #{stderr_file} #{pid_file} #{res.property.timeout} #{res.property.timeout_kill_signal} #{res.build_command_line}"
+        cmd = "#{res.property.ruby_path} #{cmd}" if res.property.ruby_path
 
         info "Adding cron job for '#{res.property.app_id}' with schedule '#{res.property.schedule}' and command '#{cmd}'"
 

data/lib/omf_rc/resource_proxy/shm_node.rb

@@ -5,6 +5,7 @@ module OmfRc::ResourceProxy::ShmNode
 
   property :app_definition_file
   property :oml_uri
+  property :ruby_path
 
   request :cron_jobs do |node|
     node.children.find_all { |v| v.type =~ /scheduled_application/ }.map do |v|

data/lib/omf_rc_shm/version.rb

@@ -1,3 +1,3 @@
 module OmfRcShm
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc_shm
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - NICTA