beetle 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1506f684cf433c4d71f7ad9019de4fe82167e2f8
-  data.tar.gz: d09515d78afb673636622a21128b41fbdc3dc19b
+  metadata.gz: ebfa8894922f4c4887499cb476611e3c09c49c34
+  data.tar.gz: f6e07dc24d0009ad1e5bcb465c70eef4f990701c
 SHA512:
-  metadata.gz: f8f92c92c3de8485554ef577c97df0991493e145a6db5ceef11c55ada11166909e4cceb640119ed5f69ee49e40ffe5f260a12aca0efd02bd926c4c8bf7cdaf71
-  data.tar.gz: cd65e07319e8a84848d2f2ac32e5ef73585573f473bd7798f08ec18919ada22f34feacc5a53fcfeb7f7ef088281b2360da700905ee56d64d5a7f26bb18de4b29
+  metadata.gz: e2cad4a90e403e051985b997ae0a56585acb7b13b1e297e4c2ebef5ad50a1423096ebcb7f1d9b6b667f0abbdf7f16c45d93c5c70cea38f332d44726b3bec5e0f
+  data.tar.gz: e666c9ee90db3efe8b259950eb0f4c67ed867479714ec02ad27e1ef8663a73cabcf32cde73b9868e9d961cfd5f59700b1963e0e16fcbe651e036d8ea8e0cc597

data/features/step_definitions/redis_auto_failover_steps.rb

@@ -1,10 +1,10 @@
 Given /^a redis server "([^\"]*)" exists as master$/ do |redis_name|
-  TestDaemons::Redis[redis_name].start
+  TestDaemons::Redis[redis_name].restart
   TestDaemons::Redis[redis_name].master
 end
 
 Given /^a redis server "([^\"]*)" exists as slave of "([^\"]*)"$/ do |redis_name, redis_master_name|
-  TestDaemons::Redis[redis_name].start
+  TestDaemons::Redis[redis_name].restart
   step "redis server \"#{redis_name}\" is slave of \"#{redis_master_name}\""
 end
 
@@ -63,7 +63,7 @@ Given /^the retry timeout for the redis master determination is reached$/ do
 end
 
 Given /^redis server "([^\"]*)" is coming back$/ do |redis_name|
-  TestDaemons::Redis[redis_name].start
+  TestDaemons::Redis[redis_name].restart
 end
 
 Given /^an old redis master file for "([^\"]*)" with master "([^\"]*)" exists$/ do |redis_configuration_client_name, redis_name|

data/features/support/test_daemons/redis.rb

@@ -16,7 +16,7 @@ module TestDaemons
     def initialize(name)
       @name = name
       @port = @@next_available_port
-      
+
       @@next_available_port += 1
       @@instances[name] = self
     end
@@ -38,11 +38,12 @@ module TestDaemons
       daemon_controller.start
     end
 
-    def restart(delay=1)
-      redis.shutdown
+    def restart(delay = 0)
+      create_dir
+      create_config
+      daemon_controller.stop
       sleep delay
-      raise "SHUTDOWN COMMAND FAILED" if running?
-      `redis-server #{config_filename}`
+      daemon_controller.start
     end
 
     def stop
@@ -77,7 +78,7 @@ module TestDaemons
     end
 
     def running?
-      cmd = "ps aux | grep 'redis-server #{config_filename}' | grep -v grep"
+      cmd = "ps aux | egrep 'redis-server.*#{port}' | grep -v grep"
       res = `#{cmd}`
       x = res.chomp.split("\n")
       x.size == 1
@@ -111,7 +112,7 @@ module TestDaemons
     def ip_with_port
       "127.0.0.1:#{port}"
     end
-  
+
     def redis
       @redis ||= ::Redis.new(:host => "127.0.0.1", :port => port)
     end
@@ -145,7 +146,7 @@ module TestDaemons
     end
 
     def config_filename
-      tmp_path + "/redis-test-server-#{name}.conf"
+      tmp_path + "/redis-test-server-#{name}-#{port}.conf"
     end
 
     def config_content
@@ -175,7 +176,7 @@ module TestDaemons
 
     def daemon_controller
       @daemon_controller ||= DaemonController.new(
-         :identifier    => "Redis test server",
+         :identifier    => "Redis test server #{name}",
          :start_command => "redis-server #{config_filename}",
          :ping_command  => lambda { running? && available? },
          :pid_file      => pid_file,
@@ -183,6 +184,5 @@ module TestDaemons
          :start_timeout => 5
       )
     end
-  
   end
 end

data/lib/beetle/redis_configuration_client.rb

@@ -95,17 +95,19 @@ module Beetle
     def build_beetle
       system = Beetle.config.system_name
       Beetle::Client.new.configure :exchange => system, :auto_delete => true do |config|
-        config.message :ping
-        config.queue   :ping, :amqp_name => "#{system}_ping_#{id}"
+        # messages sent
         config.message :pong
-        config.message :invalidate
-        config.queue   :invalidate, :amqp_name => "#{system}_invalidate_#{id}"
+        config.message :client_started
         config.message :client_invalidated
+        # messages received
+        config.message :ping
+        config.message :invalidate
         config.message :reconfigure
-        config.queue   :reconfigure, :amqp_name => "#{system}_reconfigure_#{id}"
-        config.message :client_started
-
-        config.handler [:ping, :invalidate, :reconfigure], MessageDispatcher
+        # queue setup
+        config.queue   :client, :key => 'ping', :amqp_name => "#{system}_configuration_client_#{id}"
+        config.binding :client, :key => 'invalidate'
+        config.binding :client, :key => 'reconfigure'
+        config.handler :client, MessageDispatcher
       end
     end
 

data/lib/beetle/redis_configuration_server.rb

@@ -176,18 +176,20 @@ module Beetle
     def build_beetle
       system = Beetle.config.system_name
       Beetle::Client.new.configure :exchange => system, :auto_delete => true do |config|
-        config.message :client_invalidated
-        config.queue   :client_invalidated, :amqp_name => "#{system}_client_invalidated"
-        config.message :pong
-        config.queue   :pong, :amqp_name => "#{system}_pong"
+        # messages sent
         config.message :ping
         config.message :invalidate
         config.message :reconfigure
         config.message :system_notification
+        # messages received
         config.message :client_started
-        config.queue   :client_started, :amqp_name => "#{system}_client_started"
-
-        config.handler [:pong, :client_invalidated, :client_started], MessageDispatcher
+        config.message :pong
+        config.message :client_invalidated
+        # queue setup
+        config.queue   :server, :key => 'pong', :amqp_name => "#{system}_configuration_server"
+        config.binding :server, :key => 'client_started'
+        config.binding :server, :key => 'client_invalidated'
+        config.handler :server, MessageDispatcher
       end
     end
 

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/test/test_helper.rb

@@ -17,6 +17,8 @@ class Test::Unit::TestCase
   extend ActiveSupport::Testing::Declarative
 end
 
+I18n.enforce_available_locales = false
+
 Beetle.config.logger = Logger.new(File.dirname(__FILE__) + '/../test.log')
 Beetle.config.redis_server = "localhost:6379"
 Beetle.config.redis_servers = "localhost:6379,localhost:6380"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,154 +12,154 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: bunny
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.9
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.9
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: redis
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.1'
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: hiredis
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.5
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: amq-client
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: amq-protocol
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.0
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: amqp
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.4
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: daemons
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.10
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.10
-  prerelease: false
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
 executables:
@@ -173,6 +173,14 @@ extra_rdoc_files:
 - RELEASE_NOTES.rdoc
 - MIT-LICENSE
 files:
+- MIT-LICENSE
+- README.rdoc
+- REDIS_AUTO_FAILOVER.rdoc
+- RELEASE_NOTES.rdoc
+- Rakefile
+- beetle.gemspec
+- bin/beetle
+- examples/README.rdoc
 - examples/attempts.rb
 - examples/handler_class.rb
 - examples/handling_exceptions.rb
@@ -184,12 +192,23 @@ files:
 - examples/rpc.rb
 - examples/simple.rb
 - examples/test_publisher.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
+- lib/beetle.rb
 - lib/beetle/base.rb
 - lib/beetle/client.rb
+- lib/beetle/commands.rb
 - lib/beetle/commands/configuration_client.rb
 - lib/beetle/commands/configuration_server.rb
 - lib/beetle/commands/garbage_collect_deduplication_store.rb
-- lib/beetle/commands.rb
 - lib/beetle/configuration.rb
 - lib/beetle/deduplication_store.rb
 - lib/beetle/handler.rb
@@ -205,26 +224,8 @@ files:
 - lib/beetle/redis_server_info.rb
 - lib/beetle/subscriber.rb
 - lib/beetle/version.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/amqp_gem_behavior_test.rb
 - test/beetle/base_test.rb
 - test/beetle/beetle_test.rb
@@ -243,28 +244,27 @@ files:
 - test/beetle_test.rb
 - test/colorized_test_output.rb
 - test/test_helper.rb
-- bin/beetle
 homepage: http://xing.github.com/beetle/
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues