beetle 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 437fb3b0bde81a32e99d6583110a6c4a26557fb9
-  data.tar.gz: b877e13c30fcce8270138f4dabf11a302a4b8ecf
+  metadata.gz: 5c0645f6fec12cedbcb24c47c2461b107e062e4f
+  data.tar.gz: 5f30af10846f117fe55483ee1cf17e11b9233aae
 SHA512:
-  metadata.gz: 145a9de31844e7473ddb696b599a33d5c79d18fd81cbff75ee4fcacb759e78361344f69d3553aaefe458a3e946781d30365b9367ca1b391c4aedc5f6eb2f215d
-  data.tar.gz: 31e7d3f979ee7fd08d167b3505b503987d70b6c32806b6265e1c6c6956e45a84f042efaa4be630421e3d634e8370ad8d579cee52fa0aaacf82c36c318ae89d49
+  metadata.gz: ec3a7ff7cd10bd27fa25f86053b4f0d4ed99430491f8a34e9d1e2a980cac70c0b5d585c3786e1c7cfa17ed99931ea9eceedc8dd59f9b32369914f4bf667b6ee3
+  data.tar.gz: daa67f9a0d863d90f6915089e29d9e60e80c3c3b02f45e4399d2e0047d88fbf9713afecedbb310068b18116990f3f46117c41f1c0b110799256f5ea6baa4877f

data/RELEASE_NOTES.rdoc

@@ -1,9 +1,26 @@
 = Release Notes
 
+== Version 0.4.9
+
+* Allow redis_configuration_client to run in the foreground (useful
+  for docker)
+
+== Version 0.4.8
+
+* unseen clients need to be an array
+
+== Version 0.4.7
+
+* list clients which have never sent a ping in the failover server UI
+
+== Version 0.4.6
+
+* Publish activesupport notifications to support performance measurements
+
 == Version 0.4.5
 
 * Starting mutliple redis failover clients is now prohibited by
-  defualt. This behavior can be overriden using
+  default. This behavior can be overriden using
   "beetle configuration_client start -- --multiple"
 
 == Version 0.4.4

data/beetle.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("amqp",                    ["= 1.0.2"])
   s.add_runtime_dependency("activesupport",           [">= 2.3.4"])
   s.add_runtime_dependency("eventmachine_httpserver", [">= 0.2.1"])
-  s.add_runtime_dependency("daemons",                 [">= 1.1.9"])
+  s.add_runtime_dependency("daemons",                 [">= 1.2.0"])
 
-  s.add_development_dependency("webmock", [">= 1.21.0"])
+  s.add_development_dependency("webmock", ["~> 1.21.0"])
 end

data/features/step_definitions/redis_auto_failover_steps.rb

@@ -115,7 +115,7 @@ Then /^the redis master of "([^\"]*)" should be undefined$/ do |redis_configurat
 end
 
 Then /^the redis master of the beetle handler should be "([^\"]*)"$/ do |redis_name|
-  Beetle.config.servers = "localhost:5672" # rabbitmq
+  Beetle.config.servers = "127.0.0.1:5672" # rabbitmq
   Beetle.config.logger.level = Logger::INFO
   client = Beetle::Client.new.configure :auto_delete => true do |config|
     config.queue(:echo)

data/features/support/beetle_handler

@@ -16,7 +16,7 @@ Daemons.run_proc("beetle_handler", :log_output => true, :dir_mode => :normal, :d
 
   opts.parse!(ARGV - ["start", "--"])
 
-  Beetle.config.servers = "localhost:5672" # rabbitmq
+  Beetle.config.servers = "127.0.0.1:5672" # rabbitmq
 
   # set Beetle log level to info, less noisy than debug
   Beetle.config.logger.level = Logger::INFO

data/features/support/env.rb

@@ -37,7 +37,7 @@ def redis_master_file(client_name)
 end
 
 def first_redis_configuration_client_pid
-  File.read("redis_configuration_client0.pid").chomp.to_i
+  File.read("redis_configuration_client_num0.pid").chomp.to_i
 end
 
 def system_notification_log_path

data/features/support/system_notification_logger

@@ -8,7 +8,7 @@ tmp_path = File.expand_path("../../tmp", File.dirname(__FILE__))
 system_notification_log_file_path = "#{tmp_path}/system_notifications.log"
 
 Daemons.run_proc("system_notification_logger", :log_output => true, :dir_mode => :normal, :dir => tmp_path) do
-  Beetle.config.servers = "localhost:5672" # rabbitmq
+  Beetle.config.servers = "127.0.0.1:5672" # rabbitmq
 
   # set Beetle log level to info, less noisy than debug
   Beetle.config.logger.level = Logger::DEBUG

data/features/support/test_daemons/redis.rb

@@ -184,7 +184,7 @@ module TestDaemons
          :pid_file      => pid_file,
          :log_file      => log_file,
          :start_timeout => 20,
-         :stop_timeout  => 20,
+         :stop_timeout  => 30,
       )
     end
   end

data/features/support/test_daemons/redis_configuration_client.rb

@@ -49,7 +49,7 @@ module TestDaemons
     end
 
     def pid_file
-      "#{tmp_path}/redis_configuration_client#{@daemon_id}.pid"
+      "#{tmp_path}/redis_configuration_client_num#{@daemon_id}.pid"
     end
 
     def log_file

data/lib/beetle/commands/configuration_client.rb

@@ -61,6 +61,11 @@ module Beetle
           Beetle.config.logger.level = Logger::DEBUG
         end
 
+        foreground = false
+        opts.on("-f", "--foreground", "Run in foreground") do |val|
+          foreground = true
+        end
+
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit
@@ -68,10 +73,24 @@ module Beetle
 
         opts.parse!(app_options)
 
-        Daemons.run_proc("redis_configuration_client", :multiple => multiple, :log_output => true, :dir_mode => dir_mode, :dir => dir) do
+        if foreground
           client = Beetle::RedisConfigurationClient.new
           client.id = client_id if client_id
           client.start
+        else
+          daemon_options = {
+            :multiple   => multiple,
+            :log_output => true,
+            :dir_mode   => dir_mode,
+            :dir        => dir,
+            :force      => true
+          }
+
+          Daemons.run_proc("redis_configuration_client", daemon_options) do
+            client = Beetle::RedisConfigurationClient.new
+            client.id = client_id if client_id
+            client.start
+          end
         end
       end
     end

data/lib/beetle/commands/configuration_server.rb

@@ -76,7 +76,14 @@ module Beetle
           exit
         end
 
-        Daemons.run_proc("redis_configuration_server", :log_output => true, :dir_mode => dir_mode, :dir => dir) do
+        daemon_options = {
+          :log_output => true,
+          :dir_mode   => dir_mode,
+          :dir        => dir,
+          :force      => true
+        }
+
+        Daemons.run_proc("redis_configuration_server", daemon_options) do
           config_server =  Beetle::RedisConfigurationServer.new
           Beetle::RedisConfigurationHttpServer.config_server = config_server
           http_server_port = RUBY_PLATFORM =~ /darwin/ ? 9080 : 8080

data/lib/beetle/configuration.rb

@@ -31,7 +31,7 @@ module Beetle
     # daemons. defaults to 10 seconds.
     attr_accessor :redis_failover_client_heartbeat_interval
 
-    # how long to wait until a redis_failover client daeom can be considered
+    # how long to wait until a redis_failover client daemon can be considered
     # dead. defaults to 60 seconds.
     attr_accessor :redis_failover_client_dead_interval
 

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/script/docker-run-beetle-tests

@@ -0,0 +1,5 @@
+#!/bin/bash
+ENV="RAINBOW_COLORED_TESTS=$RAINBOW_COLORED_TESTS"
+cmd="docker run -it --rm -e $ENV beetle-test"
+echo $cmd
+exec $cmd

data/test/beetle/message_test.rb

@@ -658,9 +658,10 @@ module Beetle
 
       ActiveRecord::Base.establish_connection(
         adapter:  "mysql2",
-        database: "beetle_test",
         username: "root",
-        encoding: "utf8"
+        encoding: "utf8",
+        host: "127.0.0.1",
+        port: 3306
       )
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r
@@ -158,26 +158,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.21.0
 description: A highly available, reliable messaging infrastructure
@@ -247,6 +247,7 @@ files:
 - lib/beetle/subscriber.rb
 - lib/beetle/version.rb
 - script/console
+- script/docker-run-beetle-tests
 - script/start_rabbit
 - test/beetle/amqp_gem_behavior_test.rb
 - test/beetle/base_test.rb
@@ -286,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues