embulk-input-marketo 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5485d5527116194e9cf43129e39a686675038d35
-  data.tar.gz: 932cd341055835466e2022c950babd2c0f7966ae
+  metadata.gz: 91632886c4d5a336024869408d4d1d877aa05882
+  data.tar.gz: 22c4f6b1fdba1db3ff1f00898becd767f91655c8
 SHA512:
-  metadata.gz: 31b2aa93cbb0e301b1a71fbf15c0b53f0841558aaeafb8e5d38ce884fd6cd9d34c34bc7d44678d57421e47f10739748b9815e523dffd956a6c9c76d7ebe50e41
-  data.tar.gz: b25b1163d52542cf8f284396f36e428fb55a35f1f4418784b93885cc678cc2fd320d53c98ea6648b8ace4dab920e431e447a60747295cf18e238dbcc2a2a2c76
+  metadata.gz: 3aef455faff03669b183c791c58d9643e180d29ec2d87c103dcaf6833129e9fa5efe45d970d639c65244a67324fd32b1e7c91f236be6cfbc83bb957a2082891a
+  data.tar.gz: 61dfcebdd98dbfccd44b0842b88a4aee32b01311bb40853e3bc9dd71b9cfe5435373d504550ebf188076a18b10db15a0d0f1cbde18e06f976a7112f7f05067f4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.4 - 2015-09-17
+
+* [enhancement] Retry to call API until 5 times when Timeout [#36](https://github.com/treasure-data/embulk-input-marketo/pull/36) [[Reported by @muga](https://github.com/treasure-data/embulk-input-marketo/issues/34). Thanks!]
+
 ## 0.2.3 - 2015-09-14
 
 * [enhancement] Catch config error [#33](https://github.com/treasure-data/embulk-input-marketo/pull/33)

data/embulk-input-marketo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-marketo"
-  spec.version       = "0.2.3"
+  spec.version       = "0.2.4"
   spec.authors       = ["uu59", "yoshihara"]
   spec.summary       = "Marketo input plugin for Embulk"
   spec.description   = "Loads records from Marketo."

data/lib/embulk/input/marketo_api/soap/base.rb

@@ -7,6 +7,8 @@ module Embulk
         class Base
           attr_reader :endpoint, :wsdl, :user_id, :encryption_key
 
+          RETRY_TIMEOUT_COUNT = 5
+
           def initialize(endpoint, wsdl, user_id, encryption_key)
             @endpoint = endpoint
             @wsdl = wsdl
@@ -40,7 +42,9 @@ module Embulk
 
           def savon_call(operation, locals={})
             catch_unretryable_error do
-              savon.call(operation, locals.merge(advanced_typecasting: false))
+              with_retry do
+                savon.call(operation, locals.merge(advanced_typecasting: false))
+              end
             end
           end
 
@@ -55,6 +59,18 @@ module Embulk
             }
           end
 
+          def with_retry(&block)
+            count = 0
+            begin
+              yield
+            rescue ::Timeout::Error => e
+              count += 1
+              raise e if count > RETRY_TIMEOUT_COUNT
+              Embulk.logger.warn "TimeoutError [#{count}/#{RETRY_TIMEOUT_COUNT}]. Retrying..."
+              retry
+            end
+          end
+
           def catch_unretryable_error(&block)
             yield
           rescue Savon::SOAPFault => e

data/test/embulk/input/marketo_api/soap/test_base.rb

@@ -8,6 +8,18 @@ module Embulk
         class BaseTest < Test::Unit::TestCase
           include LeadFixtures
 
+          def test_with_retry
+            any_instance_of(Savon::Client) do |klass|
+              stub(klass).call(:timeout_test, advanced_typecasting: false) { raise ::Timeout::Error }
+            end
+
+            mock(Embulk.logger).warn(/TimeoutError/).times(Base::RETRY_TIMEOUT_COUNT)
+
+            assert_raise(::Timeout::Error) do
+              soap.send(:savon_call, :timeout_test)
+            end
+          end
+
           class TestSignature < self
             def setup
               @signature = soap.__send__(:signature)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-marketo
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - uu59
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement