beetle 0.2.3 → 0.2.4

data/beetle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = ">= 1.3.1"
   s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]

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/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: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 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-06 00:00:00 +02:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency