attache 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b7c3810e65baa28f7f28fc97e86b4754d85484e
-  data.tar.gz: f3a701ece0b0a1594da9f664a7e48c8c8ad24509
+  metadata.gz: ed983d0f82a9272db5f51699ad336baa2a007931
+  data.tar.gz: 5b1642a3c9ffb783f75c40ac49e01dc1fb3fc02b
 SHA512:
-  metadata.gz: 9b822e68fe861cd1161d9cefa51b9cd39d885aabb273e90618bc4c40858df791c1e73f76cb49332c02cf06f1570bd254d0025d83c06fc452eb71b192f18725b0
-  data.tar.gz: a7f05f0702b149cc1fa81805c8408686d485a9f6fcb5446623f4dc4a406c17f5985f4834b23778aee1cea1b67f2bc03b10d7a69358df6325d1083ca9f74c1ef6
+  metadata.gz: 6ab88eaa04aba0643c3573f2740b3f1e785bd0adaad6d9bce2b335046677cec85d2198419b5224c6aeba08536bfc50d61734932be5af3f3f118195ee93438af8
+  data.tar.gz: ed3f27711b4f149b15fc68ffb50ae884c9906d4a399e1aa22cbad0fc6757d30c7412758f3ce1a953843dac3b0e9a3cc0b75cabf47e702e8283553f6434c4ab59

data/README.md

@@ -16,7 +16,7 @@ You can run your own instance on your own Heroku server
 docker run -it -p 9292:5000 --rm attache/attache
 ```
 
-Also, see [deploying attache on digital ocean in 5 minutes](https://github.com/choonkeat/attache/wiki/Deploying-Attache-on-Digital-Ocean)
+Also, see [Deploying Attache on Digital Ocean using Docker](https://github.com/choonkeat/attache/wiki/Deploying-Attache-on-Digital-Ocean-using-Docker)
 
 #### Source code
 

data/lib/attache/download.rb

@@ -28,7 +28,18 @@ class Attache::Download < Attache::Base
           cachekey = File.join(request_hostname(env), relpath)
           Attache.cache.fetch(cachekey) do
             get_first_result_async(vhosts.inject({}) {|sum,(k,v)|
-              v ? sum.merge("#{k} #{relpath}" => lambda { v.storage_get(relpath: relpath) }) : sum
+              if v
+                sum.merge("#{k} #{relpath}" => lambda {
+                  begin
+                    v.storage_get(relpath: relpath)
+                  rescue Exception
+                    Attache.logger.info "[POOL] not found #{k} #{relpath}"
+                    nil
+                  end
+                })
+              else
+                sum
+              end
             })
           end
         rescue Exception # Errno::ECONNREFUSED, OpenURI::HTTPError, Excon::Errors, Fog::Errors::Error
@@ -92,15 +103,14 @@ class Attache::Download < Attache::Base
       threads = name_code_pairs.collect {|name, code|
         Thread.new do
           Thread.handle_interrupt(BasicObject => :on_blocking) { # if killed
-            begin
-              if current_result = code.call
-                result = current_result
-                (threads - [Thread.current]).each(&:kill)        # kill siblings
-                Attache.logger.info "[POOL] found #{name.inspect}"
-              end
-            rescue Exception
-              Attache.logger.info "[POOL] not found #{name.inspect}"
-            ensure
+            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

data/lib/attache/version.rb

@@ -1,3 +1,3 @@
 module Attache
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attache
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - choonkeat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack