embulk-input-mixpanel 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29de18241b68feaf375ea8e5b75f0bf6c79063a9
-  data.tar.gz: 8f05066de1a870556450100082f3928b8a8655dc
+  metadata.gz: 8dd90cee458d5d530256723966f6cb61dceff1a0
+  data.tar.gz: 4ece79001e62af4c065423161a2aadbb2c0b6f1a
 SHA512:
-  metadata.gz: c15de7628ef891132049c4f6137774bdf4315427e9e0d7c4c6cc29d8f0deaec4dad849b9985fc65c6f2214d4e3130f45460290f5d7e3bb35b53ec65596617d10
-  data.tar.gz: 9390d1fbe6e20e773b6ef2ef23f40a9b2922556496b597604692ce22be498776e0b00cba423b995f106ee7fb21fcdf4f719ba47a87c3800201a8af9810e0e224
+  metadata.gz: 76d1b685cb7d7d66f8a8eeea81d010ecc3bec1e9a49ce2c3328f4b2f9f4086eb0a46fb61e83f5d45084ba33c664c94e70fc1cdf5201153cff6df48cbedd40ac9
+  data.tar.gz: 24ae64c8d5cfe45081fa3f8d5647a7d365cad2b349d8f6039e66b4f35ce1a7b6be9af4ec211c7c6b9f046ab0d466e934cdabb87e0ca876641cd8d25efe117d27

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.4.7 - 2016-09-08
+* [fixed] Retry was only enabled on preview and run. [#45](https://github.com/treasure-data/embulk-input-mixpanel/pull/45)
+
 ## 0.4.6 - 2016-09-07
 * [enhancement] Retry with too frequency requests error [#44](https://github.com/treasure-data/embulk-input-mixpanel/pull/44)
 

data/embulk-input-mixpanel.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-mixpanel"
-  spec.version       = "0.4.6"
+  spec.version       = "0.4.7"
   spec.authors       = ["yoshihara", "uu59"]
   spec.summary       = "Mixpanel input plugin for Embulk"
   spec.description   = "Loads records from Mixpanel."

data/lib/embulk/input/mixpanel.rb

@@ -91,7 +91,12 @@ module Embulk
       def self.guess(config)
         giveup_when_mixpanel_is_down
 
-        client = MixpanelApi::Client.new(config.param(:api_key, :string), config.param(:api_secret, :string))
+        retryer = perfect_retry({
+          retry_initial_wait_sec: config.param(:retry_initial_wait_sec, :integer, default: 1),
+          retry_limit: config.param(:retry_limit, :integer, default: 5),
+        })
+
+        client = MixpanelApi::Client.new(config.param(:api_key, :string), config.param(:api_secret, :string), retryer)
 
         range = guess_range(config)
         Embulk.logger.info "Guessing schema using #{range.first}..#{range.last} records"
@@ -105,6 +110,17 @@ module Embulk
         return {"columns" => columns}
       end
 
+      def self.perfect_retry(task)
+        PerfectRetry.new do |config|
+          config.limit = task[:retry_limit]
+          config.sleep = proc{|n| task[:retry_initial_wait_sec] * (2 * (n - 1)) }
+          config.dont_rescues = [Embulk::ConfigError]
+          config.rescues = [RuntimeError]
+          config.log_level = nil
+          config.logger = Embulk.logger
+        end
+      end
+
       def init
         @api_key = task[:api_key]
         @api_secret = task[:api_secret]
@@ -113,14 +129,6 @@ module Embulk
         @schema = task[:schema]
         @dates = task[:dates]
         @fetch_unknown_columns = task[:fetch_unknown_columns]
-        @retryer = PerfectRetry.new do |config|
-          config.limit = task[:retry_limit]
-          config.sleep = proc{|n| task[:retry_initial_wait_sec] * (2 * (n - 1)) }
-          config.dont_rescues = [Embulk::ConfigError]
-          config.rescues = [RuntimeError]
-          config.log_level = nil
-          config.logger = Embulk.logger
-        end
       end
 
       def run
@@ -210,7 +218,7 @@ module Embulk
           "from_date" => from_date,
           "to_date" => to_date,
         )
-        client = MixpanelApi::Client.new(@api_key, @api_secret, @retryer)
+        client = MixpanelApi::Client.new(@api_key, @api_secret, self.class.perfect_retry(task))
 
         if preview?
           client.export_for_small_dataset(params)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-mixpanel
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - yoshihara
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement