lib/rudy/aws/ec2.rb in rudy-0.9.3 vs lib/rudy/aws/ec2.rb in rudy-0.9.4

- old
+ new

@@ -1,9 +1,9 @@ module Rudy; module AWS module EC2 -# include Rudy::Huxtable + include Rudy::Huxtable @@mutex = Mutex.new def self.connect(access_key=nil, secret_key=nil, region=nil, logger=nil) @@ -16,11 +16,10 @@ host ||= DEFAULT_EC2_HOST port ||= DEFAULT_EC2_PORT @@ec2 = ::AWS::EC2::Base.new(:port => port, :server=> host, :access_key_id => access_key, :secret_access_key => secret_key) - @@logger = logger end protected # Execute AWS requests safely. This will trap errors and return @@ -48,13 +47,13 @@ # It's probably a bug so we're ignoring it -- Dave. rescue ::AWS::InternalError => ex raise Rudy::AWS::Error, ex.message rescue Timeout::Error => ex - STDERR.puts "Timeout (#{timeout}): #{ex.message}!" + Rudy::Huxtable.le "Timeout (#{timeout}): #{ex.message}!" rescue SocketError => ex - #STDERR.puts ex.message - #STDERR.puts ex.backtrace + #Rudy::Huxtable.le ex.message + #Rudy::Huxtable.le ex.backtrace raise SocketError, "Check your Internets!" unless @@global.offline ensure response ||= default end sleep 0.1 # defeat race conditions \ No newline at end of file