triglav-agent 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b80bb3219aa63a9e72507189e9c5354394ffb6fa
-  data.tar.gz: 815f8cd9a55c675f448648f26d1bd9e06b898eaf
+  metadata.gz: cd4f144e95ca465383d0ad12754c70909b263fb5
+  data.tar.gz: f559069d69b3a33f5e83d88f74c6dd052f313760
 SHA512:
-  metadata.gz: 2c3965d7e21a98124b0ec203359e32980681c7a0a2930a65dffc97bbc1078df294cb64d336350d50aec9f77a71976608c77d4dcdaa20e3003d30bd4d52f612b5
-  data.tar.gz: 7591dd7914e016ffe9c772a39ffeed86f210128d07fc6731943177c5750511c5f85ae4f5afd3eaa068a1359635e5c31e59c73b2bd99fc4d1e2e731cd32080bb5
+  metadata.gz: e1ef456d07edea624a0ba7db0d76ec5c5fa11258416d4c985992f8b605603407a4f18ada89f18daea34b29e6cb5354c007022edfac2d67ebc0ad22e90ab1882f
+  data.tar.gz: 0512ebfc4faa1f399ba838124ad0208d00748480e7e653661cc55270f24a9360a7335043d1c8a32be6fb87edf62b9fa8e549ec5fa214416c01dfe34254533c76

data/lib/triglav/agent/storage_file.rb

@@ -17,6 +17,24 @@ module Triglav::Agent
       @fp = fp
     end
 
+    # Load storage file
+    #
+    # @return [Hash]
+    def load
+      if !(content = @fp.read).empty?
+        YAML.load(content) # all keys must be symbols
+      else
+        {}
+      end
+    end
+
+    # Dump to storage file
+    #
+    # @param [Hash] hash
+    def dump(hash)
+      File.write(@fp.path, YAML.dump(hash))
+    end
+
     # Load storage file
     #
     #     StorageFile.load($setting.status_file)
@@ -38,11 +56,28 @@ module Triglav::Agent
     # @param [String] path
     # @param [Block] block
     def self.open(path, &block)
+      # Use RDONLY instead of WRONLY not to TRUNCate contents
       fp = File.open(path, (File::RDONLY | File::CREAT))
-      until fp.flock(File::LOCK_EX | File::LOCK_NB)
-        $logger.info { "Somebody else is locking the storage file #{path.inspect}" }
-        sleep 0.5
+      fp.flock(File::LOCK_EX)
+      begin
+        return yield(StorageFile.new(fp))
+      ensure
+        fp.flock(File::LOCK_UN)
+        fp.close rescue nil
       end
+    end
+
+    # Open storage file to read
+    #
+    #     StorageFile.readopen($setting.status_file) do |fp|
+    #       status = fp.load
+    #     end
+    #
+    # @param [String] path
+    # @param [Block] block
+    def self.readopen(path, &block)
+      fp = File.open(path, (File::RDONLY | File::CREAT))
+      fp.flock(File::LOCK_SH)
       begin
         return yield(StorageFile.new(fp))
       ensure
@@ -139,25 +174,7 @@ module Triglav::Agent
     # @param [Object] key
     def self.get(path, key)
       keys = Array(key)
-      open(path) {|fp| fp.load.dig(*keys) }
-    end
-
-    # Load storage file
-    #
-    # @return [Hash]
-    def load
-      if !(content = @fp.read).empty?
-        YAML.load(content) # all keys must be symbols
-      else
-        {}
-      end
-    end
-
-    # Dump to storage file
-    #
-    # @param [Hash] hash
-    def dump(hash)
-      File.write(@fp.path, YAML.dump(hash))
+      readopen(path) {|fp| fp.load.dig(*keys) }
     end
 
     # Keep specified keys, and remove others

data/lib/triglav/agent/version.rb

@@ -1,5 +1,5 @@
 module Triglav
   module Agent
-    VERSION = "1.0.0.rc2"
+    VERSION = "1.0.0.rc3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: triglav-agent
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Triglav Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverengine