s3backup 0.6.6 → 0.6.7

data/History.txt

@@ -17,3 +17,8 @@
 * don't use raise,change  exit and error log
 * config BUFESIZE to buffer_size
 * mod bug if directory name has '\' 
+
+
+=== 0.6.7 2010-01-19
+* default max_retry_count 6 to 10
+* add config log_level

data/README.rdoc

@@ -16,15 +16,18 @@ To use remotebackup,you should prepare backup configuretion file by yaml such be
  bucket: "bucket name"
  directories:
  - "absolute path to directory for backup/restore"
- - "absolute path to directory for backup/restore"
+ - "iterate directory as you like"
  access_key_id: 'Amazon access_key_id'
  secret_access_key: 'Amazon secret_access_key'
  password: 'password for aes. (optional)'
  salt: 'HexString(16 length) (must when password is specified) '
+ buffer_size: 'number of byte max 50000000000 (optional default 32000000)'
+ max_retry_count: 'number of retry of post if post failed.(optional default 10)'
  proxy_host: proxy host address if you use proxy.
  proxy_port: proxy port if you use proxy.
  proxy_user: login name for proxy server if you use proxy.
  proxy_password: login password for proxy server if you use proxy.
+ log_level: 'output log level. value is debug or info or warn or error(optional default info)'
 *If directories isn't specified when restore, it restores all directories in bucket.
 
 == COMMAND:

data/backup.yml

@@ -1,8 +1,15 @@
-bucket: "bucket name"
+bucket: "bucket name. it is necessary uniq of the world wide"
 directories:
 - "absolute path to directory for backup/restore"
-- "absolute path to directory for backup/restore"
+- "iterate directory as you like"
 access_key_id: 'Amazon access_key_id'
 secret_access_key: 'Amazon secret_access_key'
-password: 'password for aes. (optional)'
+password: 'password encrypt files for aes. (optional)'
 salt: 'HexString(16 length) (must when password is specified) '
+buffer_size: 'number of byte max 50000000000 (optional default 32000000)'
+max_retry_count: 'number of retry of post if post failed.(optional default 10)'
+proxy_host: 'address of proxy server(optional)'
+proxy_port: 'port of proxy server(optional)'
+proxy_user: 'user name of proxy server(optional)'
+proxy_password: 'password of proxy server(optional)'
+log_level: 'output log level. value is debug or info or warn or error(optional default info)'

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.6.6'
+  VERSION = '0.6.7'
 end

data/lib/s3backup/backup.rb

@@ -16,6 +16,14 @@ module S3backup
       @manager = Manager.new(@s3_obj,config)
     end
     def check_config(config)
+      if config["log_level"]
+        if config["log_level"] =~ /debug|info|warn|error/i
+          S3log.set_level(config["log_level"])
+        else 
+          S3log.error("log_level:#{config['log_level']} is not debug or info or warn or error") 
+          exit(-1)
+        end
+      end
       unless config["directories"]
         S3log.error("directories doesn't exist in config file.")
         exit(-1)

data/lib/s3backup/s3log.rb

@@ -6,8 +6,25 @@ module S3backup
     def S3log.get_logger
       @@log_file ? @@log_file : Logger.new($stderr) 
     end
+    def S3log.set_level(level)
+      unless @@debug 
+        case level
+        when /debug/i
+          get_logger.level = Logger::DEBUG
+        when /info/i
+          get_logger.level = Logger::INFO
+        when /warn/i
+          get_logger.level = Logger::WARN
+        when /error/i
+          get_logger.level = Logger::ERROR
+        end
+      end
+    end
     def S3log.set_debug(flg)
       @@debug=flg
+      if @@debug 
+        get_logger.level = Logger::DEBUG
+      end
     end
     def S3log.error(str)
       get_logger.error(str)
@@ -19,9 +36,7 @@ module S3backup
       get_logger.warn(str)
     end
     def S3log.debug(str)
-      if @@debug
-        get_logger.debug(str)
-      end
+      get_logger.debug(str)
     end
     def S3log.set_logfile(f)
       @@log_file = Logger.new(f)

data/lib/s3backup/s3wrapper.rb

@@ -3,7 +3,7 @@ require 'aws/s3'
 module S3backup
   class S3Wrapper
     attr_reader :bucket
-    DEFAULT_MAX_RETRY_COUNT = 6
+    DEFAULT_MAX_RETRY_COUNT = 10
     def initialize(config,create_flg)
       @bucket= nil
       @s3objects =nil
@@ -64,9 +64,8 @@ module S3backup
           break;
         rescue => ex
           count+=1;
-          S3log.debug("post #{count} times failed. #{key_name}\n")
+          S3log.info("post #{count} times failed. #{key_name}\n")
           if count >= @max_retry_count
-            raise ex
             S3log.error("post #{count} times failed #{key_name} #{ex.class}:#{ex.message}\n")
             exit(-1)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s3backup
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Takeshi Morita