beetle 0.2.3 → 0.2.5

data/features/support/test_daemons/redis_configuration_client.rb

@@ -0,0 +1,64 @@
+require 'daemon_controller'
+
+module TestDaemons
+  class RedisConfigurationClient
+    cattr_reader :instances
+    @@next_daemon_id = 0
+    @@instances = {}
+
+    def initialize(name)
+      @name = name
+      @daemon_id = @@next_daemon_id
+
+      @@next_daemon_id += 1
+      @@instances[name] = self
+    end
+
+    class << self
+      def find_or_initialize_by_name(name)
+        @@instances[name] ||= new(name)
+      end
+      alias_method :[], :find_or_initialize_by_name
+
+      def stop_all
+        @@instances.values.each{|i| i.stop}
+      end
+    end
+
+    def start
+      daemon_controller.start
+    end
+
+    def stop
+      daemon_controller.stop
+    end
+
+    def daemon_controller
+      @daemon_controller ||= DaemonController.new(
+         :identifier    => "Redis configuration test client",
+         :start_command => "ruby bin/beetle configuration_client start -- -v --redis-master-file #{redis_master_file} --id #{@name} --pid-dir #{tmp_path} --amqp-servers 127.0.0.1:5672",
+         :ping_command  => lambda{ true },
+         :pid_file      => pid_file,
+         :log_file      => log_file,
+         :start_timeout => 5
+      )
+    end
+
+    def redis_master_file
+      "#{tmp_path}/redis-master-#{@name}"
+    end
+
+    def pid_file
+      "#{tmp_path}/redis_configuration_client#{@daemon_id}.pid"
+    end
+
+    def log_file
+      "#{tmp_path}/redis_configuration_client.output"
+    end
+
+    def tmp_path
+      File.expand_path(File.dirname(__FILE__) + "/../../../tmp")
+    end
+
+  end
+end

data/features/support/test_daemons/redis_configuration_server.rb

@@ -0,0 +1,52 @@
+require 'daemon_controller'
+
+module TestDaemons
+  class RedisConfigurationServer
+
+    # At the moment, we need only one, so we implement the methods
+    # as class methods
+
+    @@redis_servers = ""
+    @@redis_configuration_clients = ""
+
+    def self.start(redis_servers, redis_configuration_clients)
+      stop
+      @@redis_servers = redis_servers
+      @@redis_configuration_clients = redis_configuration_clients
+      daemon_controller.start
+    end
+
+    def self.stop
+      daemon_controller.stop
+    end
+
+    def self.daemon_controller
+      clients_parameter_string = @@redis_configuration_clients.blank? ? "" : "--client-ids #{@@redis_configuration_clients}"
+      DaemonController.new(
+         :identifier    => "Redis configuration test server",
+         :start_command => "ruby bin/beetle configuration_server start -- -v --redis-master-file #{redis_master_file} --redis-servers #{@@redis_servers} #{clients_parameter_string} --redis-retry-interval 1 --pid-dir #{tmp_path} --amqp-servers 127.0.0.1:5672",
+         :ping_command  => lambda{ true },
+         :pid_file      => pid_file,
+         :log_file      => log_file,
+         :start_timeout => 5
+      )
+    end
+
+    def self.redis_master_file
+      "#{tmp_path}/redis-master-rc-server"
+    end
+
+    def self.pid_file
+      "#{tmp_path}/redis_configuration_server.pid"
+    end
+
+    def self.log_file
+      "#{tmp_path}/redis_configuration_server.output"
+    end
+
+    def self.tmp_path
+      File.expand_path(File.dirname(__FILE__) + "/../../../tmp")
+    end
+
+  end
+end

data/lib/beetle/redis_configuration_server.rb

@@ -64,6 +64,7 @@ module Beetle
     def pong(payload)
       id = payload["id"]
       token = payload["token"]
+      return unless validate_pong_client_id(id)
       logger.info "Received pong message from id '#{id}' with token '#{token}'"
       return unless redeem_token(token)
       @client_pong_ids_received << id
@@ -164,6 +165,15 @@ module Beetle
       redis.unknowns.include?(current_master) ? redis.slaves_of(current_master).first : current_master
     end
 
+    def validate_pong_client_id(client_id)
+      unless known_client = @client_ids.include?(client_id)
+        msg = "Received pong message from unknown client '#{client_id}'"
+        logger.error(msg)
+        beetle.publish(:system_notification, {"message" => msg}.to_json)
+      end
+      known_client
+    end
+
     def redeem_token(token)
       valid_token = token == @current_token
       logger.info "Ignored message (token was '#{token.inspect}', but expected '#{@current_token.inspect}')" unless valid_token

data/script/console

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'optparse'
+
+options = { }
+OptionParser.new do |opt|
+  opt.banner = "Usage: console [options]"
+  opt.on("--debugger", 'Enable ruby-debugging for the console.') { |v| options[:debugger] = v }
+  opt.parse!(ARGV)
+end
+
+libs =  " -r irb/completion"
+libs << %( -r ubygems)
+libs << %( -r #{File.expand_path("../../lib/beetle.rb",__FILE__)})
+
+if options[:debugger]
+  begin
+    require 'ruby-debug'
+    libs << " -r ruby-debug"
+    puts "=> Debugger enabled"
+  rescue Exception
+    puts "You need to install ruby-debug to run the console in debugging mode. With gems, use 'gem install ruby-debug'"
+    exit
+  end
+end
+
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+exec "#{irb} #{libs} --simple-prompt"

data/script/start_rabbit

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# export RABBITMQ_MNESIA_BASE=/var/lib/rabbitmq/mnesia2
+# Defaults to /var/lib/rabbitmq/mnesia. Set this to the directory where Mnesia
+# database files should be placed.
+
+# export RABBITMQ_LOG_BASE
+# Defaults to /var/log/rabbitmq. Log files generated by the server will be placed
+# in this directory.
+
+export RABBITMQ_NODENAME=$1
+# Defaults to rabbit. This can be useful if you want to run more than one node
+# per machine - RABBITMQ_NODENAME should be unique per erlang-node-and-machine
+# combination. See clustering on a single machine guide at <http://www.rab-
+# bitmq.com/clustering.html#single-machine> for details.
+
+# RABBITMQ_NODE_IP_ADDRESS
+# Defaults to 0.0.0.0. This can be changed if you only want to bind to one net-
+# work interface.
+
+export RABBITMQ_NODE_PORT=$2
+# Defaults to 5672.
+
+# RABBITMQ_CLUSTER_CONFIG_FILE
+# Defaults to /etc/rabbitmq/rabbitmq_cluster.config. If this file is present it
+# is used by the server to auto-configure a RabbitMQ cluster.  See the clustering
+# guide at <http://www.rabbitmq.com/clustering.html> for details.
+
+rabbitmq-server

data/test/beetle/deduplication_store_test.rb

@@ -73,7 +73,9 @@ module Beetle
 
     private
     def redis_test_master_file(server_string)
-      path = File.expand_path("../../../tmp/redis-master-for-unit-tests", __FILE__)
+      tmp_dir = File.expand_path("../../../tmp", __FILE__)
+      Dir.mkdir(tmp_dir) unless File.exists?(tmp_dir)
+      path = tmp_dir + "/redis-master-for-unit-tests"
       File.open(path, "w"){|f| f.puts server_string}
       path
     end

data/test/beetle/redis_configuration_server_test.rb

@@ -275,4 +275,22 @@ module Beetle
       info
     end
   end
+
+  class RedisConfigurationServerSystemNotificationAndLoggingTest < Test::Unit::TestCase
+    def setup
+      Beetle.config.redis_configuration_client_ids = "rc-client-1,rc-client-2"
+      @server = RedisConfigurationServer.new
+      @server.stubs(:beetle).returns(stub(:publish))
+      @server.stubs(:logger).returns(stub)
+      EventMachine.stubs(:add_timer).yields
+    end
+
+    test "should log and send a system notification when pong message from unknown client received" do
+      payload = {"id" => "unknown-client", "token" => @server.current_token}
+      msg = "Received pong message from unknown client 'unknown-client'"
+      @server.beetle.expects(:publish).with(:system_notification, ({:message => msg}).to_json)
+      @server.logger.expects(:error).with(msg)
+      @server.pong(payload)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-08-23 00:00:00 +02:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -182,7 +182,12 @@ executables:
 extensions: 
 - ext/mkrf_conf.rb
 extra_rdoc_files: 
+- examples/README.rdoc
+- features/README.rdoc
 - README.rdoc
+- REDIS_AUTO_FAILOVER.rdoc
+- RELEASE_NOTES.rdoc
+- MIT-LICENSE
 files: 
 - examples/attempts.rb
 - examples/handler_class.rb
@@ -212,9 +217,25 @@ files:
 - lib/beetle/redis_server_info.rb
 - lib/beetle/subscriber.rb
 - lib/beetle.rb
+- features/README.rdoc
+- features/redis_auto_failover.feature
+- features/step_definitions/redis_auto_failover_steps.rb
+- features/support/beetle_handler
+- features/support/env.rb
+- features/support/system_notification_logger
+- features/support/test_daemons/redis.conf.erb
+- features/support/test_daemons/redis.rb
+- features/support/test_daemons/redis_configuration_client.rb
+- features/support/test_daemons/redis_configuration_server.rb
+- script/console
+- script/start_rabbit
 - beetle.gemspec
+- Rakefile
 - examples/README.rdoc
 - README.rdoc
+- REDIS_AUTO_FAILOVER.rdoc
+- RELEASE_NOTES.rdoc
+- MIT-LICENSE
 - test/beetle/base_test.rb
 - test/beetle/client_test.rb
 - test/beetle/configuration_test.rb