httpimagestore 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/bin/httpimagestore

@@ -13,6 +13,8 @@ options = CLI.new do
 	option :bind, :short => :b, :default => IP.new('127.0.0.1'), :cast => IP, :description => "HTTP server bind address - use 0.0.0.0 to bind to all interfaces"
 	option :port, :short => :p, :default => 3000, :cast => Integer, :description => "HTTP server TCP port"
 	option :server, :short => :s, :default => 'mongrel', :description => "Rack server handler like thin, mongrel, webrick, fastcgi etc."
+	option :upload_retry_times, :default => 1, :cast => Integer, :description => "Number of times file upload will be retried in case of an error"
+	option :upload_retry_delay, :default => 0.0, :cast => Float, :description => "Time to sleep between retries"
 	argument :config, :cast => Pathname, :description => "Configuration file path"
 end.parse!
 
@@ -40,6 +42,8 @@ sinatra.set :lock, true
 sinatra.set :logging, (not options.no_logging)
 sinatra.set :debug, options.debug
 sinatra.set :uri_encode, (not options.no_uri_encode)
+sinatra.set :upload_retry_times, options.upload_retry_times
+sinatra.set :upload_retry_delay, options.upload_retry_delay
 
 Configuration.from_file(options.config).put(sinatra)
 
@@ -55,7 +59,7 @@ end
 sinatra.before do
 	logger.level = Logger::DEBUG if settings.logging and settings.debug
 	# singletons
-	$s3 ||= S3Service.new(settings.s3_key_id, settings.s3_key_secret, settings.s3_bucket, :logger => logger)
+	$s3 ||= S3Service.new(settings.s3_key_id, settings.s3_key_secret, settings.s3_bucket, :logger => logger, :upload_retry_times => settings.upload_retry_times, :upload_retry_delay => settings.upload_retry_delay)
 	$thumbnailer ||= HTTPThumbnailerClient.new(settings.thumbnailer_url)
 end
 

data/httpimagestore.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]

data/lib/httpimagestore/s3_service.rb

@@ -19,7 +19,11 @@ class S3Service
 		file.content_type = content_type
 		file.content = data
 
-		RetryThis.retry_this(:times => 3, :sleep => 0.1, :error_types => [Errno::ECONNRESET, S3::Error::RequestTimeout]) do |attempt|
+		RetryThis.retry_this(
+			:times => (@options[:upload_retry_times] or 1),
+			:sleep => (@options[:upload_retry_delay] or 0.0),
+			:error_types => [Errno::ECONNRESET, S3::Error::RequestTimeout]
+		) do |attempt|
 			@logger.warn "Retrying S3 save operation" if attempt > 1
 			file.save
 		end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpimagestore
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jakub Pastuszek