dumper 1.0.2 → 1.1.0

data/lib/dumper/agent.rb

@@ -6,8 +6,9 @@ module Dumper
     include Dumper::Utility::LoggingMethods
 
     API_VERSION = 1
+    MAX_FILESIZE = 2.gigabytes
 
-    attr_reader :stack
+    attr_reader :stack, :max_filesize
 
     class << self
       def start(options = {})
@@ -60,7 +61,9 @@ module Dumper
       return log("agent stopped: #{json.to_s}") if json[:status] == 'error'
 
       @token = json[:token]
-      log "agent started as #{@token ? 'primary' : 'secondary'}"
+      @max_filesize = (json[:max_filesize] || MAX_FILESIZE).to_i
+      log "agent started as #{@token ? 'primary' : 'secondary'}, max_filesize = #{@max_filesize}"
+
       sleep 1.hour + rand(10) unless @token
 
       loop do

data/lib/dumper/database/base.rb

@@ -5,10 +5,6 @@ module Dumper
 
       attr_accessor :tmpdir, :filename, :config
 
-      def initialize(stack = nil)
-        @stack = stack
-      end
-
       def file_ext
         self.class::FILE_EXT
       end

data/lib/dumper/database/mongodb.rb

@@ -10,8 +10,8 @@ module Dumper
 
       def connection_options
         [ :database, :host, :port, :username, :password ].map do |option|
-          next if @config.send(option).blank?
-          "--#{option}='#{@config.send(option)}'".gsub('--database', '--db')
+          next if @config[option].blank?
+          "--#{option}='#{@config[option]}'".gsub('--database', '--db')
         end.compact.join(' ')
       end
 
@@ -19,11 +19,11 @@ module Dumper
         "--out='#{tmpdir}'"
       end
 
-      def config_for(rails_env=nil)
+      def set_config_for(rails_env=nil)
         return unless defined?(Mongo::DB) &&
           (mongo = find_instance_in_object_space(Mongo::DB))
 
-        {
+        @config = {
           :host => mongo.connection.host,
           :port => mongo.connection.port,
           :database => mongo.name,

data/lib/dumper/database/mysql.rb

@@ -5,13 +5,13 @@ module Dumper
       FILE_EXT = 'sql.gz'
 
       def command
-        "cd #{tmpdir} && #{dump_tool_path} #{connection_options} #{additional_options} #{@config.database} | gzip > #{filename}"
+        "cd #{tmpdir} && #{dump_tool_path} #{connection_options} #{additional_options} #{@config[:database]} | gzip > #{filename}"
       end
 
       def connection_options
         [ :host, :port, :username, :password ].map do |option|
-          next if @config.send(option).blank?
-          "--#{option}='#{@config.send(option)}'".gsub('--username', '--user')
+          next if @config[option].blank?
+          "--#{option}='#{@config[option]}'".gsub('--username', '--user')
         end.compact.join(' ')
       end
 
@@ -19,13 +19,13 @@ module Dumper
         '--single-transaction'
       end
 
-      def config_for(rails_env=nil)
+      def set_config_for(rails_env=nil)
         return unless defined?(ActiveRecord::Base) &&
           ActiveRecord::Base.configurations &&
           (config = ActiveRecord::Base.configurations[rails_env]) &&
           %w(mysql mysql2).include?(config['adapter'])
 
-        {
+        @config = {
           :host => config['host'],
           :port => config['port'],
           :username => config['username'],

data/lib/dumper/database/postgresql.rb

@@ -5,27 +5,27 @@ module Dumper
       FILE_EXT = 'sql.gz'
 
       def command
-        "cd #{tmpdir} && #{password_variable} #{dump_tool_path} #{connection_options} #{@config.database} | gzip > #{filename}"
+        "cd #{tmpdir} && #{password_variable} #{dump_tool_path} #{connection_options} #{@config[:database]} | gzip > #{filename}"
       end
 
       def connection_options
         [ :host, :port, :socket ].map do |option|
-          next if @config.send(option).blank?
-          "--#{option}='#{@config.send(option)}'".gsub('--socket', '--host')
+          next if @config[option].blank?
+          "--#{option}='#{@config[option]}'".gsub('--socket', '--host')
         end.compact.join(' ')
       end
 
       def password_variable
-        @config.password.blank? ? '' : "PGPASSWORD='#{@config.password}'"
+        @config[:password].blank? ? '' : "PGPASSWORD='#{@config[:password]}'"
       end
 
-      def config_for(rails_env=nil)
+      def set_config_for(rails_env=nil)
         return unless defined?(ActiveRecord::Base) &&
           ActiveRecord::Base.configurations &&
           (config = ActiveRecord::Base.configurations[rails_env]) &&
           (config['adapter'] == 'postgresql')
 
-        {
+        @config = {
           :host => config['host'],
           :port => config['port'],
           :username => config['username'],

data/lib/dumper/database/redis.rb

@@ -6,10 +6,10 @@ module Dumper
 
       def command
         uncompressed = filename.sub('.gz','')
-        "cd #{tmpdir} && cp #{@config.dbpath} #{uncompressed} && gzip #{uncompressed}"
+        "cd #{tmpdir} && cp #{@config[:dbpath]} #{uncompressed} && gzip #{uncompressed}"
       end
 
-      def config_for(rails_env=nil)
+      def set_config_for(rails_env=nil)
         return unless defined?(::Redis) &&
           (main_thread_redis = find_instance_in_object_space(::Redis))
 
@@ -23,7 +23,7 @@ module Dumper
 
         return unless File.exist?(dbpath) # Redis must run on the back up node
 
-        {
+        @config = {
           :host => client.host,
           :port => client.port,
           :password => client.password,

data/lib/dumper/job.rb

@@ -6,11 +6,8 @@ module Dumper
     include POSIX::Spawn
     include Dumper::Utility::LoggingMethods
 
-    MAX_FILESIZE = 4.gigabytes
-
     def initialize(agent, job)
       @agent = agent
-      @stack = agent.stack
       @job = job
     end
 
@@ -25,14 +22,10 @@ module Dumper
     end
 
     def perform(server)
-      # Initialize database
+      # Find database
       server_type = server[:type].to_sym
-      if Dumper::Stack::DATABASES.keys.include?(server_type)
-        @database = Dumper::Stack::DATABASES[server_type].new(@stack)
-        @database.config = OpenStruct.new(@stack.configs[Dumper::Stack::DATABASES.key(@database.class)])
-      else
-        abort_with "invalid server type: #{server_type}"
-      end
+      abort_with "invalid server type: #{server_type}" unless Dumper::Stack::DATABASES.keys.include?(server_type)
+      return log "database not found: #{@database.inspect}" unless @database = @agent.stack.databases[server_type]
 
       # Prepare
       json = @agent.api_request('backup/prepare', :params => { :server_id => server[:id], :manual => server[:manual].to_s, :ext => @database.file_ext })
@@ -61,7 +54,7 @@ module Dumper
 
       dump_duration = Time.now - start_at
       log "dump_duration = #{dump_duration}"
-      if (filesize = File.size(@database.dump_path)) > MAX_FILESIZE
+      if (filesize = File.size(@database.dump_path)) > @agent.max_filesize
         abort_with("max filesize exceeded: #{filesize}", :too_large)
       end
 

data/lib/dumper/stack.rb

@@ -9,10 +9,10 @@ module Dumper
       :redis      =>  Dumper::Database::Redis,
     }
 
-    attr_accessor :rails_env, :dispatcher, :framework, :rackup, :configs
+    attr_accessor :rails_env, :dispatcher, :framework, :rackup, :databases
 
     def initialize(options = {})
-      @configs = {}
+      @databases = {}
 
       # Rackup?
       @rackup = find_instance_in_object_space(Rack::Server)
@@ -25,8 +25,8 @@ module Dumper
         @is_supported_rails_version = (::Rails::VERSION::MAJOR >= 3)
         DATABASES.each do |key, klass|
           database = klass.new
-          next unless config = database.config_for(@rails_env) || database.config_for(options[:additional_env])
-          @configs[key] = config
+          next unless database.set_config_for(@rails_env) || database.set_config_for(options[:additional_env])
+          @databases[key] = database
         end
 
       else
@@ -45,13 +45,13 @@ module Dumper
         rails_env: @rails_env,
         rails_version: @rails_version,
         dispatcher: @dispatcher,
-        configs: Hash[@configs.map{|k, config| [ k, config.reject{|k,v| k == :password } ] }]
+        configs: Hash[@databases.map{|k, database| [ k, database.config.reject{|k,v| k == :password } ] }]
       }
     end
 
     # Compatibility
     def supported?
-      @is_supported_rails_version && @dispatcher && !@configs.empty?
+      @is_supported_rails_version && @dispatcher && !@databases.empty?
     end
 
     # Dispatcher

data/lib/dumper/version.rb

@@ -1,3 +1,3 @@
 module Dumper
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dumper
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json