beetle 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce5804b3e44afd72e9f650d3599d9a57ed4cc4b5
-  data.tar.gz: f3ea8613d41b1a28f6ed89af6b85cffc7502cb02
+  metadata.gz: 9f405a0852e21f9fdfdcd51e960295b57b4d8d1e
+  data.tar.gz: a5629866029fc7faab95362442c0256d3342630b
 SHA512:
-  metadata.gz: 3615e631ca7dc4a2dfe90f5fa04425237e5c2148eb567b881f086eb467d4f605cc52bec4c3d2969abeb93c641bc2e15a8eb56548895227d7e19ff4ef16943fbc
-  data.tar.gz: c718fccb2c910adb9f5cedf698ca1f0396d9d8b96971eb5ed5853c66da384a6b4eab9aa1e0b1d0f5f9a54a2697132df4c812d565bc9c44b531e0d34811af21b7
+  metadata.gz: e751112c09982ef6dce8a0dc8c8c8d7ff5854071bab42c311bdb1d86303248bd9ee2786f4e810d2433a4b1544744cf074a18bec034a551fa3b0b15bff92ef587
+  data.tar.gz: a1acda41c4afe1fe352c4ea7fc0c43274a884355b1640b741e467c6e75ecc45f68dc30a19a1ca401f0917dd3f87077fab77df4507135d8d32580e5d80019a3d2

data/REDIS_AUTO_FAILOVER.rdoc

@@ -65,7 +65,7 @@ all other redis servers into slaves of the current master.
 
 * on startup, an RCC can consult its redis master file to determine the current master without the help of the RCS by checking that it's still a master (or wait for the periodic reconfigure message with the current master from the RCS)
 * when the RCS finds the master to be down, it will retry a couple of times before starting a reconfiguration round
-* the RCS sends all RCCs a "ping" message to check if every client is there and able to to answer
+* the RCS sends all RCCs a "ping" message to check if every client is there and able to answer
 * the RCCs acknowledge via a "pong" message if they can confirm the current master to be unavailable
 * the RCS waits for *all* RCCs to reply via pong
 * the RCS tells all RCCs to stop using the master by sending an "invalidate" message

data/RELEASE_NOTES.rdoc

@@ -1,12 +1,20 @@
 = Release Notes
 
+== Version 0.4.5
+
+* Starting mutliple redis failover clients is now prohibited by
+  defualt. This behavior can be overriden using
+  "beetle configuration_client start -- --multiple"
+
 == Version 0.4.4
+
 * added command to show beetle version: "beetle --version"
 * configuration server tracks ids of unknown clients
 * configuration clients now sends heartbeats
 * configuration server tracks last seen times of clients, based on heartbeat
 
 == Version 0.4.3
+
 * fixed a race condition which could lead to duplicate message processing
 * fixed eventmachine shutdown sequence problem, which led to ACKs
   occasionally being lost due to writing to a closed socket, which in

data/features/support/test_daemons/redis_configuration_client.rb

@@ -36,7 +36,7 @@ module TestDaemons
     def daemon_controller
       @daemon_controller ||= DaemonController.new(
          :identifier    => "Redis configuration test client #{@name}",
-         :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",
+         :start_command => "ruby bin/beetle configuration_client start -- -v --multiple --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,

data/lib/beetle/commands/configuration_client.rb

@@ -14,6 +14,7 @@ module Beetle
     #           --amqp-servers LIST          AMQP server list (e.g. 192.168.0.1:5672,192.168.0.2:5672)
     #           --config-file PATH           Path to an external yaml config file
     #           --pid-dir DIR                Write pid and log to DIR
+    #           --multiple                   Allow multiple clients started in parallel (for testing only)
     #       -v, --verbose                    Set log level to DEBUG
     #       -h, --help                       Show this message
     #
@@ -51,6 +52,11 @@ module Beetle
           dir = val
         end
 
+        multiple = false
+        opts.on("--multiple", "Allow multiple clients") do |val|
+          multiple = true
+        end
+
         opts.on("-v", "--verbose", "Set log level to DEBUG") do |val|
           Beetle.config.logger.level = Logger::DEBUG
         end
@@ -62,7 +68,7 @@ module Beetle
 
         opts.parse!(app_options)
 
-        Daemons.run_proc("redis_configuration_client", :multiple => true, :log_output => true, :dir_mode => dir_mode, :dir => dir) do
+        Daemons.run_proc("redis_configuration_client", :multiple => multiple, :log_output => true, :dir_mode => dir_mode, :dir => dir) do
           client = Beetle::RedisConfigurationClient.new
           client.id = client_id if client_id
           client.start

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/test/beetle/redis_configuration_client_test.rb

@@ -20,7 +20,7 @@ module Beetle
       @client.stubs(:clear_redis_master_file)
       @client.beetle.expects(:publish).with(:client_started, {:id => @client.id}.to_json)
       @client.beetle.expects(:listen).yields
-      EventMachine.expects(:add_periodic_timer).with(60).yields
+      EventMachine.expects(:add_periodic_timer).with(Beetle.config.redis_failover_client_heartbeat_interval).yields
       @client.beetle.expects(:publish).with(:heartbeat, {:id => @client.id}.to_json)
       @client.start
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r