attache 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 142d8bbaf242702c8f4ffc3dd138981bf5e36515
-  data.tar.gz: 489c6110a4ccf9d646537d0e29ae3be1febd9d71
+  metadata.gz: 637b0e3db30b5d851946c433e8df383d38708d39
+  data.tar.gz: 9103c50678a077092a9c43a10bab435e425e86ac
 SHA512:
-  metadata.gz: 42ca943075fad7ef4c8897f617bfec5c758687d45b31c50ee6d841459b6bc53351bb47c3a62d5614041de7a85158b07e9723de3196ea06b46fac10dae5a61ef6
-  data.tar.gz: bdc7479ebc633564b8ab06208f4bdafa74ca4cd6631e83f9d08daeb5061f147c0ea34c864048fa95d557b151c1f0a2818153e5564cde31c62e789190c5ab4f97
+  metadata.gz: ca9c7794c0dac8a080ec267d849c3d0a786fb1b60c3041b80548c37115ac2af33d57963d29f2c4634aa23647252ce5eaa9561b4a63b52b068033f82200a41eb1
+  data.tar.gz: 980b910c931c32d814d7c757fe7e74a0b1ee376a4e657c988ab531866f52e2029279b0961fe24c6b08423b43ef915d912aff9666048cbf78dd1f7894c7500d7b

data/README.md

@@ -25,6 +25,7 @@ You can checkout the source code and run it like a regular [a Procfile-based app
 ```
 git clone https://github.com/choonkeat/attache.git
 cd attache
+bundle install
 foreman start -c web=1 -p 9292
 ```
 

data/lib/attache/download.rb

@@ -27,19 +27,18 @@ class Attache::Download < Attache::Base
         file = begin
           cachekey = File.join(request_hostname(env), relpath)
           Attache.cache.fetch(cachekey) do
-            get_first_result_async(vhosts.inject({}) {|sum,(k,v)|
-              if v
-                sum.merge("#{k} #{relpath}" => lambda {
-                  begin
-                    v.storage_get(relpath: relpath)
-                  rescue Exception
-                    Attache.logger.info "[POOL] not found #{k} #{relpath}"
-                    nil
+            name_with_vhost_pairs = vhosts.inject({}) { |sum,(k,v)| (v ? sum.merge(k => v) : sum) }
+            get_first_result_present_async(name_with_vhost_pairs.collect {|name, vhost|
+              lambda { Thread.handle_interrupt(BasicObject => :on_blocking) {
+                begin
+                  vhost.storage_get(relpath: relpath).tap do |v|
+                    Attache.logger.info "[POOL] found #{name} #{relpath} = #{v.inspect}"
                   end
-                })
-              else
-                sum
-              end
+                rescue Exception
+                  Attache.logger.info "[POOL] not found #{name} #{relpath}"
+                  nil
+                end
+              } }
             })
           end
         rescue Exception # Errno::ECONNREFUSED, OpenURI::HTTPError, Excon::Errors, Fog::Errors::Error
@@ -93,24 +92,16 @@ class Attache::Download < Attache::Base
       end
     end
 
-    def get_first_result_async(name_code_pairs)
-      result = nil
-      threads = name_code_pairs.collect {|name, code|
-        Thread.new do
-          Thread.handle_interrupt(BasicObject => :on_blocking) { # if killed
-            if result
-              # war over
-            elsif current_result = code.call
-              result = current_result
-              (threads - [Thread.current]).each(&:kill)        # kill siblings
-              Attache.logger.info "[POOL] found #{name.inspect}"
-            else
-              # no contribution
-            end
-          }
-        end
-      }
-      threads.each(&:join)
+    # Ref https://gist.github.com/sferik/39831f34eb87686b639c#gistcomment-1652888
+    # a bit more complicated because we *want* to ignore falsey result
+    def get_first_result_present_async(lambdas)
+      return if lambdas.empty? # queue.pop will never happen
+      queue = Queue.new
+      threads = lambdas.collect { |code| Thread.new { queue << code.call } }
+      until result = queue.pop do
+        break unless threads.any?(&:alive?) || queue.size > 0
+      end
+      threads.each(&:kill)
       result
     end
 end

data/lib/attache/version.rb

@@ -1,3 +1,3 @@
 module Attache
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attache
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - choonkeat