s3backup 0.7.2 → 0.7.3

data/lib/s3backup/manager.rb

@@ -192,9 +192,6 @@ module S3backup
       #前回と今回のファイル・ツリーを比較
       diff_info = tree_info.diff(old_tree)
       S3log.debug("diff_info=#{diff_info.inspect}")
-      tmp = Tempfile.open("tree_info.yml")
-      tmp.write(tree_info.dump_yaml)
-      tmp.close
       dir_map = nil
       if @resume
         new_dir_map = tree_info.make_dir_map
@@ -203,8 +200,6 @@ module S3backup
         #メモリ節約のため開放
         old_tree = nil 
       end
-      #メモリ節約のため開放
-      tree_info = nil
       update_dir = diff_info[:directory][:add] + diff_info[:directory][:modify]
       #更新されたディレクトリをアップロード
       update_dir.each do |udir|
@@ -220,10 +215,8 @@ module S3backup
       diff_info[:directory][:remove].each do |rm_dir|
         delete_direcory(rm_dir)
       end
-      tmp.open
       #今回のファイル・ツリーをAWS S3に登録
-      @target.post(target_tree_name,tmp.read)
-      tmp.close(true)
+      @target.post(target_tree_name,tree_info.dump_yaml)
     end
     def get_target_tree(dir)
       base_dir = dir

data/lib/s3backup/s3wrapper.rb

@@ -44,13 +44,43 @@ module S3backup
     end
     def exists?(key)
       key=CGI.escape(key)
-      ret = AWS::S3::S3Object.exists? key,@bucket_name
+      count = 0;
+      while true do
+        begin
+          ret = AWS::S3::S3Object.exists? key,@bucket_name
+          break;
+        rescue => ex
+          count+=1;
+          S3log.info("exists? #{count} times failed. #{key}\n")
+          if count >= @max_retry_count
+            S3log.error("post #{count} times failed #{key_name} #{ex.class}:#{ex.message}\n")
+            exit(-1)
+          end
+          sleep(count*30)
+          AWS::S3::Base.establish_connection!(@args)
+        end
+      end
     end
     def get(key)
       key_name = CGI.escape(key)
+      count = 0;
       data = nil
-      if AWS::S3::S3Object.exists? key_name,@bucket_name
-        data =  AWS::S3::S3Object.value(key_name,@bucket_name)
+      while true do
+        begin
+          if AWS::S3::S3Object.exists? key_name,@bucket_name
+            data =  AWS::S3::S3Object.value(key_name,@bucket_name)
+          end
+          break;
+        rescue => ex
+          count+=1;
+          S3log.info("get #{count} times failed. #{key_name}\n")
+          if count >= @max_retry_count
+            S3log.error("get  #{count} times failed #{key_name} #{ex.class}:#{ex.message}\n")
+            exit(-1)
+          end
+          sleep(count*30)
+          AWS::S3::Base.establish_connection!(@args)
+        end
       end
       return data
     end 
@@ -110,7 +140,22 @@ module S3backup
     def delete(key)
       if exists? key
         S3log.info("S3Object.delete(#{CGI.escape(key)})")
-        AWS::S3::S3Object.delete(CGI.escape(key),@bucket_name)
+        count = 0;
+        while true do
+          begin
+            AWS::S3::S3Object.delete(CGI.escape(key),@bucket_name)
+            break
+          rescue => ex
+            count+=1;
+            S3log.info("delete #{count} times failed. #{key}\n")
+            if count >= @max_retry_count
+              S3log.error("delete #{count} times failed #{key} #{ex.class}:#{ex.message}\n")
+              exit(-1)
+            end
+            sleep(count*30)
+            AWS::S3::Base.establish_connection!(@args)
+          end
+        end
         return true
       end
       return false

data/lib/s3backup.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module S3backup
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s3backup
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Takeshi Morita
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 +09:00
+date: 2010-01-31 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency