sdbcli 1.1.2 → 1.1.3

data/README

@@ -24,6 +24,7 @@ https://bitbucket.org/winebarrel/sdbcli
           --import-replace=DOMAIN,FILE
           --export=DOMAIN,FILE
           --retry=NUM
+          --retry-interval=SECOND
   shell> export AWS_ACCESS_KEY_ID='...'
   shell> export AWS_SECRET_ACCESS_KEY='...'
   shell> export SDB_ENDPOINT='sdb.ap-northeast-1.amazonaws.com' # or SDB_REGION=ap-northeast-1

data/bin/sdbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '1.1.2'
+Version = '1.1.3'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 HISTSIZE = 500
 SELECT_LIMIT = 2500
@@ -25,6 +25,7 @@ $consistent = false
 import = nil
 export = nil
 import_export_retry = 3
+retry_interval = 60
 timeout = 60
 
 ARGV.options do |opt|
@@ -39,6 +40,7 @@ ARGV.options do |opt|
   opt.on(''  , '--import-replace=DOMAIN,FILE') {|v| import = v.split(/\s*,\s*/, 2) + [true] }
   opt.on(''  , '--export=DOMAIN,FILE') {|v| export = v.split(/\s*,\s*/, 2) }
   opt.on(''  , '--retry=NUM', Integer) {|v| import_export_retry = v.to_i }
+  opt.on(''  , '--retry-interval=SECOND', Integer) {|v| retry_interval = v.to_i }
   opt.parse!
 
   unless access_key_id and secret_access_key and sdb_endpoint
@@ -188,11 +190,18 @@ if export
         begin
           items = $runner.execute(query + query_expr, true, $consistent)
           break
+        rescue SimpleDB::Error => e
+          if /\AServiceUnavailable:/ =~ e.message
+            raise e if i >= import_export_retry
+          else
+            raise e
+          end
         rescue Timeout::Error => e
           raise e if i >= import_export_retry
         end
 
-        output_error("Retry...", true)
+        output_error("Retry... (wait %d seconds)" % retry_interval, true)
+        sleep retry_interval
       end
 
       break if items.empty?
@@ -290,11 +299,18 @@ if import
           end
 
           break
+        rescue SimpleDB::Error => e
+          if /\AServiceUnavailable:/ =~ e.message
+            raise e if i >= import_export_retry
+          else
+            raise e
+          end
         rescue Timeout::Error => e
           raise e if i >= import_export_retry
         end
 
-        output_error("Retry...", true)
+        output_error("Retry... (wait %d seconds)" % retry_interval, true)
+        sleep retry_interval
       end
 
       output_error("#{rownum} #{rownum > 1 ? 'rows' : 'row'} was inputted...", true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdbcli
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors: