shopify_unlimited 0.0.14.threadsafe → 0.0.15.threadsafe

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGJhYTI2MWQ4NjQxNjNlODZmN2I3ZTY3MjEzZGQ0MjIxZGZhZDI2ZQ==
+    Njc4NjgzNmIxMjBiMDk3MjI2NWJkYmY2ZjZkN2FiYzY2NWQ0ZDMwZQ==
   data.tar.gz: !binary |-
-    ZTQzMDliNDE3MGZmY2RiY2E5OTRjYjdkZDRmZjYwNjZhNDQ2ZmE4Yw==
+    ODllNjY5ZTFhNTJmZmU1NWU2NWMxZDQ2MzFmZTkzMTk2YWZkMTllMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjgyNzMxMTE5NWIyOGQxODAyNWI4YTdkZGUwZjBiNTQwOWQzMWJhZDRiYjNk
-    MzA3MDI3YTJiOGI4YjNiODRjN2FlNDAxMjI5NTRhNzE5ODVlYTU3NjhmNWRj
-    MDRjN2RkNmFiNzc1YjRiMWJlN2UwY2QyZTQyMzdlM2U2OWZiNDI=
+    MDEyOWEwODYzOTkzNDNmYjg4YTM1OTQ1ZjhhZDY0MjEzMTIxYWQ1MzIyNWQw
+    MmM1M2Y3MDE5MjFhYmZhOTg2ZTBiOTZlZTY2Y2EzMjcxYzc4YzkyOGQ5YWU3
+    OTQ0YzAyMDBhZDAzNzliZWIxNjM4YjA3NmU4N2NlNGI2NjZkN2Q=
   data.tar.gz: !binary |-
-    ZWE3MjM3ODk3NmY3ZGYzNDZjYzI4ZjU4OGZhNGNmNzU1ZGFkNDk1ZDIwYWFj
-    MjE5OGE2ZjBiNjM1YzFkMjk4NmJhMjQ4YTRhNjVlNWQ3YzU0NTg1MzQzMDY4
-    ZWQxZDEwNzlkMDRjMjc0ZDhiMGMzMjdlYzZlZGM0MzhhNDM5MWU=
+    YzgzZTU1NWE0ODMxNDcwY2YxYzA2OWVkMjNkZGQ0OGViZWQ2ODgwYWFlOWQ5
+    YTRkZDI2MTY1MjI0ZWI4M2RiYzgyMjhhYmI0OTdmYTIxMjJmNmY1N2JkYmJl
+    ZTVjM2NjYWZmYjRjZDFmYmJhMmQyN2RkYzhiODIyYWFlYTdjNjk=

data/lib/shopify_unlimited/shopify_api/throttle.rb

@@ -4,6 +4,12 @@
 # of requests until finished, which will typically happen with
 # any naive, non-stochastic implementation.
 
+# currently this is only true when only one request at a time
+# is passed to throttle.run
+# When it becomes useful, we could add an argument to throttle.run
+# to specify the number of expected requests. However, that would have
+# has the downside that the thread might end up waiting a long time 
+# for a large enough block of requests.
 
 module ShopifyAPI
   class Shop
@@ -23,6 +29,7 @@ module ShopifyAPI
     def run(&block)
       value = nil
       retries ||= 0
+      orig_logger = ActiveResource::Base.logger
       begin
         left = ShopifyAPI.credit_left
         over = @requests_threshold - left
@@ -37,18 +44,18 @@ module ShopifyAPI
       rescue ActiveResource::ClientError => e
         case e.response.code
         when '404'
-          logger.fatal "Shopify returned not found"
           sleep 5 + retries + (rand * rand * 5)
           retries += 1
           if retries < 4
-            ActiveResource::Base.logger = Logger.new(STDOUT) 
+            ActiveResource::Base.logger ||= Logger.new(STDOUT)
+            ActiveResource::Base.logger.info "Shopify returned not found: #{e.message}. Retrying"
             retry
           else
-            ActiveResource::Base.logger = nil
+            ActiveResource::Base.logger = orig_logger
             raise
           end
         when '429'
-          logger.warn "Shopify hit api limit"
+          ActiveResource::Base.logger.info "Shopify hit api limit" if ActiveResource::Base.logger
           @throttle += rand/5
           retries += 1
           sleep (@throttle * 4 * retries) + rand/10

data/lib/shopify_unlimited/version.rb

@@ -1,3 +1,3 @@
 module ShopifyUnlimited
-  VERSION = "0.0.14.threadsafe"
+  VERSION = "0.0.15.threadsafe"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_unlimited
 version: !ruby/object:Gem::Version
-  version: 0.0.14.threadsafe
+  version: 0.0.15.threadsafe
 platform: ruby
 authors:
 - Michael Johnston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource