beetle 0.2.1 → 0.2.4

data/README.rdoc

@@ -54,12 +54,11 @@ windows and execute the following commands:
     rake redis:start1
     rake redis:start2
 
-
 == Prerequisites
 
 To set up a redundant messaging system you will need
 * at least 2 AMQP servers (we use {RabbitMQ}[http://www.rabbitmq.com/])
-* at least one Redis server (better are two in a master/slave setup)
+* at least one {Redis}[http://github.com/antirez/redis] server (better are two in a master/slave setup)
 
 == Gem Dependencies
 
@@ -67,15 +66,17 @@ At runtime, Beetle will use
 * {uuid4r}[http://github.com/skaes/uuid4r]
   (which needs ossp-uuid)
 * {bunny}[http://github.com/celldee/bunny]
-* {redis-rb}[http://github.com/ezmobius/redis-rb]
-  (which needs {redis}[http://github.com/antirez/redis])
+* {redis}[http://github.com/ezmobius/redis-rb]
 * {amqp}[http://github.com/tmm1/amqp]
   (which is based on {eventmachine}[http://github.com/eventmachine/eventmachine])
+* {daemons}[http://daemons.rubyforge.org/]
 * activesupport
 
 For development, you'll need
-* mocha
-* rcov
+* {mocha}[http://github.com/floehopper/mocha]
+* {rcov}[http://github.com/relevance/rcov]
+* {cucumber}[http://github.com/aslakhellesoy/cucumber]
+* {daemon_controller}[http://github.com/FooBarWidget/daemon_controller]
 
 == Authors
 

data/beetle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.2.1"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = ">= 1.3.1"
   s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.specification_version = 3
   s.add_runtime_dependency("uuid4r",                [">= 0.1.1"])
   s.add_runtime_dependency("bunny",                 [">= 0.6.0"])
-  s.add_runtime_dependency("redis",                 [">= 2.0.3"])
+  s.add_runtime_dependency("redis",                 [">= 2.0.4"])
   s.add_runtime_dependency("amqp",                  [">= 0.6.7"])
   s.add_runtime_dependency("activesupport",         [">= 2.3.4"])
   s.add_runtime_dependency("daemons",               [">= 1.0.10"])

data/lib/beetle/commands/configuration_client.rb

@@ -46,7 +46,7 @@ module Beetle
 
         dir_mode = nil
         dir = nil
-        opts.on("--pid-dir DIR", String, "Write pid and log to DIR") do |val|
+        opts.on("--pid-dir DIR", String, "Write pid and output to DIR") do |val|
           dir_mode = :normal
           dir = val
         end

data/lib/beetle/commands/configuration_server.rb

@@ -55,7 +55,7 @@ module Beetle
 
         dir_mode = nil
         dir = nil
-        opts.on("--pid-dir DIR", String, "Write pid and log to DIR") do |val|
+        opts.on("--pid-dir DIR", String, "Write pid and output to DIR") do |val|
           dir_mode = :normal
           dir = val
         end

data/lib/beetle/configuration.rb

@@ -4,8 +4,10 @@ module Beetle
   class Configuration
     # system name (used for redis cluster partitioning) (defaults to <tt>system</tt>)
     attr_accessor :system_name
-    # default logger (defaults to <tt>Logger.new(STDOUT)</tt>)
+    # default logger (defaults to <tt>Logger.new(log_file)</tt>)
     attr_accessor :logger
+    # defaults to <tt>STDOUT</tt>
+    attr_accessor :log_file
     # number of seconds after which keys are removed form the message deduplication store (defaults to <tt>3.days</tt>)
     attr_accessor :gc_threshold
     # the redis server to use for deduplication
@@ -49,14 +51,6 @@ module Beetle
     def initialize #:nodoc:
       self.system_name = "system"
 
-      self.logger = begin
-        logger = Logger.new(STDOUT)
-        logger.formatter = Logger::Formatter.new
-        logger.level = Logger::INFO
-        logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-        logger
-      end
-
       self.gc_threshold = 3.days
       self.redis_server = "localhost:6379"
       self.redis_servers = ""
@@ -72,6 +66,8 @@ module Beetle
       self.vhost = "/"
       self.user = "guest"
       self.password = "guest"
+
+      self.log_file = STDOUT
     end
 
     # setting the external config file will load it on assignment
@@ -80,6 +76,16 @@ module Beetle
       load_config
     end
 
+    def logger
+      @logger ||= begin
+        l = Logger.new(log_file)
+        l.formatter = Logger::Formatter.new
+        l.level = Logger::INFO
+        l.datetime_format = "%Y-%m-%d %H:%M:%S"
+        l
+      end
+    end
+
     private
     def load_config
       hash = YAML::load(ERB.new(IO.read(config_file)).result)

data/lib/beetle/message.rb

@@ -279,7 +279,7 @@ module Beetle
     end
 
     def run_handler(handler)
-      Redis::Timer.timeout(@timeout.to_f) { @handler_result = handler.call(self) }
+      Timer.timeout(@timeout.to_f) { @handler_result = handler.call(self) }
       RC::OK
     rescue Exception => @exception
       Beetle::reraise_expectation_errors!

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/lib/beetle/redis_ext.rb

@@ -51,29 +51,3 @@ class Redis #:nodoc:
     info["role"] == "slave" && info["master_host"] == host && info["master_port"] == port.to_s
   end
 end
-
-class Redis::Client #:nodoc:
-  protected
-  def connect_to(host, port)
-    if @timeout != 0 and Redis::Timer
-      begin
-        Redis::Timer.timeout(@timeout){ @sock = TCPSocket.new(host, port) }
-      rescue Timeout::Error
-        @sock = nil
-        raise Timeout::Error, "Timeout connecting to the server"
-      end
-    else
-      @sock = TCPSocket.new(host, port)
-    end
-
-    @sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
-
-    # If the timeout is set we set the low level socket options in order
-    # to make sure a blocking read will return after the specified number
-    # of seconds. This hack is from memcached ruby client.
-    self.timeout = @timeout
-
-  rescue Errno::ECONNREFUSED
-    raise Errno::ECONNREFUSED, "Unable to connect to Redis on #{host}:#{port}"
-  end
-end

data/lib/beetle.rb

@@ -54,4 +54,5 @@ module Beetle
     end
   end
 
+  Timer = RUBY_VERSION < "1.9" ? SystemTimer : Timeout
 end

data/test/beetle/configuration_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-require 'tempfile'
 
 module Beetle
   class ConfigurationTest < Test::Unit::TestCase
@@ -13,5 +12,19 @@ module Beetle
       config.config_file = "some/path/to/a/file"
       assert_equal new_value, config.gc_threshold
     end
+    
+    test "should log to STDOUT if no log_file given" do
+      config = Configuration.new
+      Logger.expects(:new).with(STDOUT).returns(stub_everything)
+      config.logger
+    end
+
+    test "should log to file if log_file given" do
+      file = '/path/to/file'
+      config = Configuration.new
+      config.log_file = file
+      Logger.expects(:new).with(file).returns(stub_everything)
+      config.logger
+    end
   end
 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

data/test/beetle/redis_ext_test.rb

@@ -56,15 +56,9 @@ module Beetle
   end
 
   class RedisTimeoutTest < Test::Unit::TestCase
-    test "should use Redis::Timer if timeout is greater 0" do
+    test "should use a timer" do
       r = Redis.new(:host => "localhost", :port => 6390, :timeout => 1)
-      Redis::Timer.expects(:timeout).with(1).raises(Timeout::Error)
-      assert_equal({}, r.info_with_rescue)
-    end
-
-    test "should not use Redis::Timer if timeout 0" do
-      r = Redis.new(:host => "localhost", :port => 6390, :timeout => 0)
-      Redis::Timer.expects(:timeout).never
+      r.client.expects(:with_timeout).with(1).raises(Timeout::Error)
       assert_equal({}, r.info_with_rescue)
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +02:00
+date: 2010-08-06 00:00:00 +02:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,12 +61,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 2
         - 0
-        - 3
-        version: 2.0.3
+        - 4
+        version: 2.0.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency