omf_rc_shm 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2U5ZGUyMzMyNGQzZThkZjk4OWZjMzIwOTNlMWQxYThhZDkwZDg1Zg==
+    ODIxMDgzNTk2ZmViYzBlNDViZDVhNTBlZTIwN2NlODQ2ZWI0ZWRmMw==
   data.tar.gz: !binary |-
-    MzYyNGVhZTg5NWQ4ODdiNTY2ZjhlNmZmZGFjNjkzMzE1YTFjNWRlMg==
+    MmJiMDE0Yzk0MTA0Mzc1ZjM2NzhhMzM2YjJhZGI2NjI5ZjMxYTM5Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGNhZTUzNzY1OWMyZTBmMzA2ZTk1ZjcyMzVhMTU0MGUwZGM0NWI1ZGM4YjVi
-    ZjU5MTQ4ZjRkYmUyYmVlOGNkZGY1MmYwMGJiZjgzZWRlOTgyZmQ0ODY4Zjhh
-    MjBhYzAwOWViZmI0ZDFkYjRmMTJiMGMyNTI4YjVlMTA4MjU1YjQ=
+    M2ZmNzI5MjNjZDM3MDI2NjhhNWNjMjE0ZmI3OTBhODU2NDJmNDFjNDcwOTZi
+    YTQxOWM4MDMxNzQ4Mjk1NjA5ZTgxYzQwNzIwNGY4YjVhOWFmMWM0ODIxNGQz
+    ZDVlZDAwYTc4N2RlMmFhYWJjMWI0NjlkM2YxNTQ1OWVlODMyZmE=
   data.tar.gz: !binary |-
-    NjlmZWE0YmNlMTE3NTlmN2MzZmMxZTQxZDBhMjI5NmYwMTcyMzZkODcyNmFl
-    NTNkYTJkOWUwY2MzYjNiYjgxNjEwMDdjMDZhNWEwNzM5NzQ4NmIyZTBmNjA0
-    YTg5NDQwZTQ3Zjg4MzcwZWUyZWIyNTE2OGEyYzVkYzljNzNhNTg=
+    YmIzNmI4ZTc4ODMyMDEwNmI5YjJiMTA1ZWJjMGFhNzUwM2I2OTExNmY3MWQz
+    YzgxMWM3MDQyMDlkY2IxOThhYjMxZTQ1ZjhkYzUwYzlmMDllZWI2NGJhYjBh
+    M2Q5NWE0NmY3YWNhMWFiYjNiNTk1NTU2NDE5YzhlZDFmN2I2MWQ=

data/config/rc.yml.sample

@@ -6,9 +6,12 @@
 
 :resources:
 - :type: shm_node
-  :uid: <%= Socket.gethostname %>
+  :uid: <%= ip = `ifconfig br0`.match(/inet addr:(\d*\.\d*\.\d*\.\d*)/)[1].split('.') ; 'node' + (ip[2].to_i*256+ip[3].to_i).to_s.rjust(4,'0') %>
   :app_definition_file: path_to_your_app_definition_file
   :ruby_path: <full_path_to_ruby>
+  # Uncomment :watchdog_timer line to start the watchdog time, set the top-up
+  # value in second (make sure to have it lower than timeout value)
+  #:watchdog_timer: 15
 
 :add_default_factories: false # Not loading default type factories
 

data/lib/omf_rc/resource_proxy/shm_node.rb

@@ -6,6 +6,7 @@ module OmfRc::ResourceProxy::ShmNode
   property :app_definition_file
   property :oml_uri
   property :ruby_path
+  property :watchdog_timer, :default => nil
 
   request :cron_jobs do |node|
     node.children.find_all { |v| v.type =~ /scheduled_application/ }.map do |v|
@@ -24,6 +25,13 @@ module OmfRc::ResourceProxy::ShmNode
         s_app.configure_state(:scheduled)
       end
     end
+    # if required, start the watchdog timer and periodically top it
+    unless node.property.watchdog_timer.nil? 
+      info "Watchdog Timer started with interval: #{node.property.watchdog_timer}"
+      EventMachine.add_periodic_timer(node.property.watchdog_timer.to_i) do 
+        `echo "1" >/dev/watchdog`
+      end
+    end
   end
 
   hook :before_ready do

data/lib/omf_rc_shm/version.rb

@@ -1,3 +1,3 @@
 module OmfRcShm
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc_shm
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler