sparoid 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b933d6729f0ce76259c272550548532b15a206218239b9f824cd58b0deec6ee3
-  data.tar.gz: 61a1ec401ecebf13674e3b66e684df99ea5007f051e91b5bf98cc783e9f91c15
+  metadata.gz: 12dad3dbab45bb38650465dab2b26f356c051569b06d20ba1bcfd6af11eb9701
+  data.tar.gz: 0b17fe457b36978f1b682153cb14578192cb657a846fadcbb3abb2cf82e07bb6
 SHA512:
-  metadata.gz: 173cb6c71c46ba88153306d5124879ade2f53eedda41da85b58475abc3fddc0e0d5dee00ab459e546ab0b283411044dbaa016369ccb74a791a22126dc5dc99dd
-  data.tar.gz: 71318184eb58dbcbcc713aebd1c2e22375562af77ae29083b90f0933bc078991f1860fc00fbccad5e55396f37845b098f3c4494cae381c71e79b30a8e6a8124a
+  metadata.gz: 1c31f7b1fa30e2d064b0e92e79b2b567bdfa4021995d7f52c25b6b4373d08062ed091aab8187aeb42051c11e0c7c1b994d158878e64311eed28e68d1e3fe4008
+  data.tar.gz: cacd2adf45ed9fa8e31b063809e01cf0371c6d13670e24b5bdb17f7c2623c2f9592c7e38b6df18a5f529db9628d4197baf323a9d58124b8eb6ea75762c3a6d78

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.0.12] - 2021-06-14
+
+- Use file locking to prevent multiple processes/threads to write to the public ip cache file
+
 ## [1.0.11] - 2021-06-14
 
 - Log hostname when reporting unhandled exceptions

data/lib/sparoid.rb

@@ -76,23 +76,38 @@ module Sparoid
   end
 
   def cached_public_ip
-    File.open("/tmp/.sparoid_public_ip", "a+") do |f|
-      if f.size.zero? || (Time.now - f.mtime) > 60 # cache for 1min max
-        update_cache(f)
-      else
-        Resolv::IPv4.create f.read
-      end
+    if up_to_date_cache?
+      read_cache
+    else
+      write_cache
     end
   rescue StandardError => e
     warn "Sparoid: #{e.inspect}"
     public_ip
   end
 
-  def update_cache(file)
-    ip = public_ip
-    file.truncate(0)
-    file.write ip.to_s
-    ip
+  def up_to_date_cache?
+    mtime = File.mtime("/tmp/.sparoid_public_ip")
+    (Time.now - mtime) <= 60 # cache is valid for 1 min
+  rescue Errno::ENOENT
+    false
+  end
+
+  def read_cache
+    File.open("/tmp/.sparoid_public_ip", "r") do |f|
+      f.flock(File::LOCK_SH)
+      Resolv::IPv4.create f.read
+    end
+  end
+
+  def write_cache
+    File.open("/tmp/.sparoid_public_ip", File::WRONLY | File::CREAT, 0o0644) do |f|
+      f.flock(File::LOCK_EX)
+      ip = public_ip
+      f.truncate(0)
+      f.write ip.to_s
+      ip
+    end
   end
 
   def public_ip

data/lib/sparoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sparoid
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor