omf_rc_shm 0.1.17 → 0.1.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGFmMDYyMWEyZGU3ZmQ4NzRiYjFjYzBhOTdkNTRmMjQ3YWEwYjZjOQ==
+    ZjRiMjIzZmRmNGJmNzA1MmNjN2I2NDEzZGQ0YzliMDI3YmFjMzE1Yw==
   data.tar.gz: !binary |-
-    M2Y1ZTBmMzNkMmE5NmRiMzY4Y2VmNTZkYzNkMGEzNzBlNWFlMjBiOQ==
+    YzI5YTViNmI2OGUyODBmNDIxNjc2YmI3NDllY2M5NmVkMzBhNjE3Nw==
 SHA512:
   metadata.gz: !binary |-
-    MWZmYTAwMjE4M2U3NjEzM2EwN2YyYTQ3ZDEyNGUwZDY2MTJhNmZmNzVkYTNj
-    NGJhYWE2MGVlOTljZTY4YzFlNzBmNmE3ZDBjY2NkYWZmNDdjYWUyY2NjM2Rh
-    MTY0ZDkzNjY1NjUzMGM5NmNiNTc3NGQ4NjBiOWM5NTA5M2VmNDE=
+    MWQ3MzdiZGVmNTA4YjBjMDQwYjQ4YjM5MDAzMDFkZGZjZGY1YTM4ZWEzZTBi
+    NDRkYzAwOTUxNjJhMTViMjhjNWRkNWFlMTVjMzBkNWU2ZDA2NmU0OTFhNzll
+    YThmMTQ2OWRiY2Y3YTExNDA1NGViMWFlODRmMmIwODU1MmIzNjY=
   data.tar.gz: !binary |-
-    NmU1NDdhOGU2MTAyM2YwODkxMTEzYmE4MjYyYzQ4ZjAyNDY5MDFjMTYwZjY0
-    ODZkZWUxMjJjYjBhNzRlNTgwOGQ4ZTk1OWUyNDNiOTI5MzdiNDU5MTJmNGI0
-    MzgxNDA1ZTRiMDI1Yzc2ODJjNDI2ZDIyMDg3YTczZGQxYzUyYmE=
+    NGE4YTZhMmMxYzk0MDE5MjEzM2RiOTg4YWQ2ZTk2MjQ0Y2NiN2QyODg1ZTdk
+    OTZiYzUyNmY5Njk5NGIzOTBiMDUzZGQ4ODBmYmM0NDRjZDM3MTViYmU3OTc4
+    YWFiMzUxODY5NmIyOTVjZWVhYjk3YWRmMjYzMDhmOTc0ZTY3MDI=

data/lib/omf_rc/resource_proxy/shm_node.rb

@@ -23,28 +23,28 @@ module OmfRc::ResourceProxy::ShmNode
     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
+      dt = node.property.time_sync_maxdrift.to_i + 1
+      lt = rt = t = 0
+      while dt >node.property.time_sync_maxdrift.to_i do
+        t = t+1
         begin
           lt = Time.now ; rt = Net::NTP.get.time ; dt = (lt-rt).abs
-        rescue Exception => e 
+          if dt > node.property.time_sync_maxdrift.to_i
+            info "Time sync try #{t} - 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}`
+            sleep(rand(node.property.time_sync_interval.to_i))
+          else
+            break
+          end
+        rescue Exception => e
           info "Time sync try #{i} - Cannot contact NTP server (#{e})"
+          sleep(rand(node.property.time_sync_interval.to_i))
         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
+        if t > node.property.time_sync_tries.to_i
+          info "Time sync FAILED! EXITING NOW!"
+          exit
+        end
+      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

data/lib/omf_rc_shm/version.rb

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

metadata

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