omf_rc_shm 0.1.15 → 0.1.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTJmMDM5Mjk2NjQ0YmYxNDViNjliYjA0OTA4MDc4OTZkNDRkMTFlZg==
+    MGFmMDYyMWEyZGU3ZmQ4NzRiYjFjYzBhOTdkNTRmMjQ3YWEwYjZjOQ==
   data.tar.gz: !binary |-
-    ZjMxN2E3YmJlY2UwZDhiYjc3Y2IxMTNhYTkyNTNkMDQ2ODQyMjdlNA==
+    M2Y1ZTBmMzNkMmE5NmRiMzY4Y2VmNTZkYzNkMGEzNzBlNWFlMjBiOQ==
 SHA512:
   metadata.gz: !binary |-
-    NWFhMmVhMTJkZjBjODY4YmFkZWMzMTQ0ZDI1NTg1NTQxODYzMGI3NTVjMmRh
-    ODBjODQxMzlkMWI4OTI0MTRkMGEyMTRhNjI4YTNhNGE5NGUyN2VmODY0MDk3
-    Yjc0ODc1ZGZkNDI5Yjk2NTQ4ZDI5NTUyNjhlYzU3MWRkZDhjNjg=
+    MWZmYTAwMjE4M2U3NjEzM2EwN2YyYTQ3ZDEyNGUwZDY2MTJhNmZmNzVkYTNj
+    NGJhYWE2MGVlOTljZTY4YzFlNzBmNmE3ZDBjY2NkYWZmNDdjYWUyY2NjM2Rh
+    MTY0ZDkzNjY1NjUzMGM5NmNiNTc3NGQ4NjBiOWM5NTA5M2VmNDE=
   data.tar.gz: !binary |-
-    OTk3MDg3MDcyN2RmM2Q1N2M3OGEyZDdhMjNjMjg5YjY1ZWNjYzcyMzcwZGJh
-    ZGMxZGYxODRlNzMzYzg1NjZjNDA0ZWM4M2ZmMjI2Y2I4ZTdhYTk3YTIzODhh
-    NWRjNGM1ZTFlNDhmMzU5YjA4ZTJkMjViNjFhNzE5OTJhMzkxZDM=
+    NmU1NDdhOGU2MTAyM2YwODkxMTEzYmE4MjYyYzQ4ZjAyNDY5MDFjMTYwZjY0
+    ODZkZWUxMjJjYjBhNzRlNTgwOGQ4ZTk1OWUyNDNiOTI5MzdiNDU5MTJmNGI0
+    MzgxNDA1ZTRiMDI1Yzc2ODJjNDI2ZDIyMDg3YTczZGQxYzUyYmE=

data/config/config.yml

@@ -2,8 +2,9 @@
 ---
 # URI to the communication system
 # - local://local for no oustide communication
+# - amqp://my.amqp.server.com to use AMQP communication
 # - xmpp://user:password@some.xmpp.server to use XMPP communication via 
-#   some.xmpp.server, using the specified user and password 
+#   some.xmpp.server, using the specified user and password
 :uri: local://local
 :environment: production
 :debug: false
@@ -13,7 +14,8 @@
   # ID to give to this SHM node
   # by default construct 'node1234' ID based on IP address of the br0 interface
   # as requested by the SHM team
-  :uid: '<%= ip = `ifconfig br0`.match(/inet addr:(\d*\.\d*\.\d*\.\d*)/)[1].split('.') ; (ip[2].to_i*256+ip[3].to_i).to_s.rjust(5,'0') %>'
+  #:uid: '<%= ip = `ifconfig br0`.match(/inet addr:(\d*\.\d*\.\d*\.\d*)/)[1].split('.') ; (ip[2].to_i*256+ip[3].to_i).to_s.rjust(5,'0') %>'
+  :uid: '<%= mac = `/sbin/ifconfig br0`.match(/HWaddr (\h*\:\h*\:\h*\:\h*:\h*:\h*)/)[1].split(':') ; (mac[4]+mac[5]).hex.to_s.rjust(5,'0') %>'
   # Path to the file with the default application schedule
   :app_definition_file: /etc/omf_rc/scheduled_app.rb
   # Path to find the Ruby binary
@@ -21,9 +23,20 @@
   # The top-up value in second for the watchdog timer (must be lower than timeout value)
   # Comment that line to disable the watchdog timer
   :watchdog_timer: 15
+  # Ensure local time is synced with NTP time before doing anything else.
+  # Local time is considered synced if it is within 'time_sync_maxdrift' second drift of NTP time.
+  # It will try 'time_sync_tries' times to do time sync using the command 'time_sync_cmd'.
+  # Each failed sync attempt will trigger a random sleep up to 'time_sync_interval' second before the next attempt.
+  :time_sync_tries: 20
+  :time_sync_maxdrift: 600
+  :time_sync_interval: 20
+  :time_sync_cmd: "/usr/bin/ntpdate -b -t 10 -u au.pool.ntp.org"
 
 :add_default_factories: false # Not loading default type factories
 
 :factories: # Additional resources which can be created by this RC
-- :require: omf_rc_shm
-
+  load: [
+    'omf_rc_shm',
+    'omf_rc/resource_proxy/scheduled_application',
+    'omf_rc/resource_proxy/application'
+  ]

data/lib/omf_rc/resource_proxy/shm_node.rb

@@ -7,6 +7,10 @@ module OmfRc::ResourceProxy::ShmNode
   property :oml_uri
   property :ruby_path
   property :watchdog_timer, :default => nil
+  property :time_sync_tries, :default => nil
+  property :time_sync_maxdrift, :default => 600
+  property :time_sync_interval, :default => 20
+  property :time_sync_cmd, :default => "/usr/bin/ntpdate -b -t 10 -u au.pool.ntp.org"
 
   request :cron_jobs do |node|
     node.children.find_all { |v| v.type =~ /scheduled_application/ }.map do |v|
@@ -15,6 +19,35 @@ module OmfRc::ResourceProxy::ShmNode
   end
 
   hook :after_initial_configured do |node|
+		# 1) Do not continue unless we have some 'ok' time sync!
+    unless node.property.time_sync_tries.nil?
+			require 'net/ntp'
+			info "Option 'time_sync_tries' is set. Continue only if local time is accurate, will try to sync #{node.property.time_sync_tries} times with random wait of up to #{node.property.time_sync_interval}s."
+			(1..node.property.time_sync_tries.to_i).each do |i|
+        dt = node.property.time_sync_maxdrift.to_i
+        lt = 0
+        rt = 0
+        begin
+          lt = Time.now ; rt = Net::NTP.get.time ; dt = (lt-rt).abs
+        rescue Exception => e 
+          info "Time sync try #{i} - Cannot contact NTP server (#{e})"
+        end
+        if dt > node.property.time_sync_maxdrift.to_i
+  				info "Time sync try #{i} - Local: #{lt.to_i} - NTP: #{rt.to_i} - Diff: #{dt} - (sync: #{node.property.time_sync_cmd.to_s})"
+          res = `#{node.property.time_sync_cmd.to_s}` 
+				else
+					break
+				end
+				sleep(rand(node.property.time_sync_interval.to_i))
+			end
+		  lt = Time.now ; rt = Net::NTP.get.time ; dt = (lt-rt).abs
+			if dt > node.property.time_sync_maxdrift.to_i
+				info "Time sync FAILED! EXITING NOW!"
+				exit
+			end
+  		info "Time sync OK - Local: #{lt.to_i} - NTP: #{rt.to_i} - Diff: #{dt}"
+		end
+		# 2) if present, load and set default app schedule
     unless node.request_app_definition_file.nil?
       OmfRcShm.app.load_definition(node.request_app_definition_file)
       info "Loaded scheduled app definition from '#{node.request_app_definition_file}'"
@@ -27,7 +60,7 @@ module OmfRc::ResourceProxy::ShmNode
         OmfCommon.el.after(5) { s_app.configure_state(:scheduled) }
       end
     end
-    # if required, start the watchdog timer and periodically top it
+    # 3) 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}"
       OmfRcShm.app.watchdog = File.open('/dev/watchdog', 'w')
@@ -36,6 +69,8 @@ module OmfRc::ResourceProxy::ShmNode
         OmfRcShm.app.watchdog.flush
       end
     end
+		# 4) Finally display our SHM Node ID:
+		info "SHM Node ID: #{node.uid}"
   end
 
   hook :before_ready do

data/lib/omf_rc_shm/version.rb

@@ -1,3 +1,3 @@
 module OmfRcShm
-  VERSION = "0.1.15"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc_shm
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler