beetle 0.3.0.rc.7 → 0.3.0.rc.8

data/beetle.gemspec

@@ -32,19 +32,20 @@ Gem::Specification.new do |s|
   INFO
 
   s.specification_version = 3
-  s.add_runtime_dependency("uuid4r",                [">= 0.1.2"])
-  s.add_runtime_dependency("bunny",                 ["= 0.7.8"])
-  s.add_runtime_dependency("redis",                 ["= 2.2.2"])
-  s.add_runtime_dependency("hiredis",               ["= 0.3.2"])
-  s.add_runtime_dependency("amq-client",            ["= 0.8.3"])
-  s.add_runtime_dependency("amq-protocol",          ["= 0.8.1"])
-  s.add_runtime_dependency("amqp",                  ["= 0.8.0"])
-  s.add_runtime_dependency("activesupport",         [">= 2.3.4"])
-  s.add_runtime_dependency("daemons",               [">= 1.0.10"])
-  s.add_development_dependency("rake",              [">= 0.8.7"])
-  s.add_development_dependency("mocha",             [">= 0"])
-  s.add_development_dependency("rcov",              [">= 0"])
-  s.add_development_dependency("cucumber",          [">= 0.7.2"])
-  s.add_development_dependency("daemon_controller", [">= 0"])
+  s.add_runtime_dependency("uuid4r",                  [">= 0.1.2"])
+  s.add_runtime_dependency("bunny",                   ["= 0.7.8"])
+  s.add_runtime_dependency("redis",                   ["= 2.2.2"])
+  s.add_runtime_dependency("hiredis",                 ["= 0.3.2"])
+  s.add_runtime_dependency("amq-client",              ["= 0.8.3"])
+  s.add_runtime_dependency("amq-protocol",            ["= 0.8.1"])
+  s.add_runtime_dependency("amqp",                    ["= 0.8.0"])
+  s.add_runtime_dependency("activesupport",           [">= 2.3.4"])
+  s.add_runtime_dependency("eventmachine_httpserver", [">= 0.2.1"])
+  s.add_runtime_dependency("daemons",                 [">= 1.0.10"])
+  s.add_development_dependency("rake",                [">= 0.8.7"])
+  s.add_development_dependency("mocha",               [">= 0"])
+  s.add_development_dependency("rcov",                [">= 0"])
+  s.add_development_dependency("cucumber",            [">= 0.7.2"])
+  s.add_development_dependency("daemon_controller",   [">= 0"])
 end
 

data/features/redis_auto_failover.feature

@@ -103,3 +103,7 @@ Feature: Redis auto failover
     And an old redis master file for "rc-client-1" with master "redis-1" exists
     And a redis configuration client "rc-client-1" using redis servers "redis-1,redis-2" exists
     Then the redis master of "rc-client-1" should be "redis-1"
+
+  Scenario: Redis configuation server should embed a http server
+    Given a redis configuration server using redis servers "redis-1,redis-2" with clients "rc-client-1,rc-client-2" exists
+    Then the redis configuration server should answer http requests

data/features/step_definitions/redis_auto_failover_steps.rb

@@ -132,3 +132,9 @@ Then /^a system notification for no slave available to become new master should
   text = "Redis master could not be switched, no slave available to become new master"
   assert_match /#{text}/, File.readlines(system_notification_log_path).last
 end
+
+Then /^the redis configuration server should answer http requests$/ do
+  TestDaemons::RedisConfigurationServer.answers_text_requests?
+  TestDaemons::RedisConfigurationServer.answers_html_requests?
+  TestDaemons::RedisConfigurationServer.answers_json_requests?
+end

data/features/support/test_daemons/redis_configuration_server.rb

@@ -1,4 +1,5 @@
 require 'daemon_controller'
+require 'net/http'
 
 module TestDaemons
   class RedisConfigurationServer
@@ -25,7 +26,7 @@ module TestDaemons
       DaemonController.new(
          :identifier    => "Redis configuration test server",
          :start_command => "ruby bin/beetle configuration_server start -- -v --redis-master-file #{redis_master_file} --redis-servers #{@@redis_servers} #{clients_parameter_string} --redis-retry-interval 1 --pid-dir #{tmp_path} --amqp-servers 127.0.0.1:5672",
-         :ping_command  => lambda{ true },
+         :ping_command  => lambda{ answers_text_requests? },
          :pid_file      => pid_file,
          :log_file      => log_file,
          :start_timeout => 5
@@ -48,5 +49,39 @@ module TestDaemons
       File.expand_path(File.dirname(__FILE__) + "/../../../tmp")
     end
 
+    def self.answers_text_requests?
+      response = get_status("/.txt", "text/plain")
+      response.code == '200' &&
+        response.content_type == "text/plain"
+    rescue
+      false
+    end
+
+    def self.answers_json_requests?
+      response = get_status("/.json", "application/json")
+      response.code == '200' &&
+        response.content_type == "application/json"
+    rescue
+      false
+    end
+
+    def self.answers_html_requests?
+      response = get_status("/", "text/html")
+      response.code == '200' &&
+        response.content_type == "txt/html"
+    rescue
+      false
+    end
+
+    def self.get_status(path, content_type)
+      uri = URI.parse("http://127.0.0.1:8080#{path}")
+      http = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Get.new(uri.request_uri)
+      request['Accept'] = content_type
+      response = http.request(request)
+      # $stderr.puts response.content_type
+      # $stderr.puts response.body
+      response
+    end
   end
 end

data/lib/beetle.rb

@@ -7,6 +7,7 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'set'
 require 'socket'
+require 'beetle/version'
 
 module Beetle
   Timer = if RUBY_VERSION < "1.9"

data/lib/beetle/commands/configuration_server.rb

@@ -77,7 +77,12 @@ module Beetle
         end
 
         Daemons.run_proc("redis_configuration_server", :log_output => true, :dir_mode => dir_mode, :dir => dir) do
-          Beetle::RedisConfigurationServer.new.start
+          config_server =  Beetle::RedisConfigurationServer.new
+          Beetle::RedisConfigurationHttpServer.config_server = config_server
+          EM.run do
+            config_server.start
+            EM.start_server '0.0.0.0', 8080, Beetle::RedisConfigurationHttpServer
+          end
         end
       end
     end

data/lib/beetle/redis_configuration_http_server.rb

@@ -0,0 +1,98 @@
+require 'evma_httpserver'
+
+module Beetle
+  class RedisConfigurationHttpServer < EM::Connection
+     include EM::HttpServer
+
+     def post_init
+       super
+       no_environment_strings
+     end
+
+    cattr_accessor :config_server
+
+    def process_http_request
+      # the http request details are available via the following instance variables:
+      #   @http_protocol
+      #   @http_request_method
+      #   @http_cookie
+      #   @http_if_none_match
+      #   @http_content_type
+      #   @http_path_info
+      #   @http_request_uri
+      #   @http_query_string
+      #   @http_post_content
+      #   @http_headers
+      response = EM::DelegatedHttpResponse.new(self)
+      # headers = @http_headers.split("\0").inject({}){|h, s| (s =~ /^([^:]+): (.*)$/ && (h[$1] = $2)); h }
+
+      case @http_request_uri
+      when '/', '/.html'
+        response.content_type 'text/html'
+        server_status(response, "html")
+      when "/.json"
+        response.content_type 'application/json'
+        server_status(response, "json")
+      when "/.txt"
+        response.content_type 'text/plain'
+        server_status(response, "plain")
+      else
+        not_found(response)
+      end
+      response.send_response
+    end
+
+    def server_status(response, type)
+      response.status = 200
+      status = config_server.status
+      response.content =
+        case type
+        when "plain"
+          plain_text_response(status)
+        when "json"
+          status.to_json
+        when "html"
+          html_response(status)
+        end
+    end
+
+    def plain_text_response(status)
+      status.keys.sort_by{|k| k.to_s}.map do |k|
+        name = k.to_s # .split('_').join(" ")
+        if (value = status[k]).is_a?(Array)
+          value = value.join(", ")
+        end
+        "#{name}: #{value}"
+      end.join("\n")
+    end
+
+    def html_response(status)
+      b = "<!doctype html>\n"
+      b << "<html><head><title>Beetle Configuration Server Status</title>#{html_styles(status)}</head>"
+      b << "<body><h1>Beetle Configuration Server Status</h1><table cellspacing=0>\n"
+      plain_text_response(status).split("\n").compact.each do |row|
+        row =~/(^[^:]+): (.*)$/
+        b << "<tr><td>#{$1}</td><td>#{$2}</td></tr>\n"
+      end
+      b << "</table></body></html>"
+    end
+
+    def html_styles(status)
+      warn_color = status[:redis_master_available?] ? "#5780b2" : "#A52A2A"
+      <<"EOS"
+<style media="screen" type="text/css">
+html { font: 1.25em/1.5 arial, sans-serif;}
+body { margin: 1em; }
+table tr:nth-child(2n+1){ background:#fff; }
+td { padding: 0.1em 0.2em; }
+h1 { color: #{warn_color}; margin-bottom: 0.2em;}
+</style>
+EOS
+    end
+
+    def not_found(response)
+      response.content_type 'text/plain'
+      response.status = 404
+    end
+  end
+end

data/lib/beetle/redis_configuration_server.rb

@@ -21,6 +21,9 @@ module Beetle
     # the current token used to detect correct message order
     attr_reader :current_token
 
+    # the list of known client ids
+    attr_reader :client_ids
+
     def initialize #:nodoc:
       @client_ids = Set.new(config.redis_configuration_client_ids.split(","))
       @current_token = (Time.now.to_f * 1000).to_i
@@ -43,6 +46,19 @@ module Beetle
       beetle.config
     end
 
+    # returns a hash describing the current server status
+    def status
+      {
+        :beetle_version => Beetle::VERSION,
+        :configured_brokers => config.servers.split(/\s*,\s*/),
+        :configured_client_ids => client_ids.to_a.sort,
+        :configured_redis_servers => config.redis_servers.split(/\s*,\s*/),
+        :redis_master => current_master.try(:server).to_s,
+        :redis_master_available? => master_available?,
+        :redis_slaves_available => available_slaves.map(&:server),
+      }
+    end
+
     # start watching redis
     def start
       verify_redis_master_file_string
@@ -126,6 +142,11 @@ module Beetle
       redis.masters.include?(current_master)
     end
 
+    # list of available redis slaves
+    def available_slaves
+      redis.slaves
+    end
+
     private
 
     def check_redis_configuration

data/lib/beetle/redis_server_info.rb

@@ -52,12 +52,13 @@ module Beetle
       masters.first
     end
 
-    private
-
+    # check whether all redis servers are up and configured
     def master_and_slaves_reachable?
       masters.size == 1 && slaves.size == instances.size - 1
     end
 
+    private
+
     def reset
       @server_info = Hash.new {|h,k| h[k]= []}
     end

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.0.rc.7"
+  VERSION = "0.3.0.rc.8"
 end

data/script/console~

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+$:.unshift(File.expand_path("../lib",__FILE__))

data/test/beetle/redis_configuration_server_test.rb

@@ -59,6 +59,10 @@ module Beetle
       @server.beetle.expects(:publish).with(:reconfigure, payload)
       @server.master_available!
     end
+
+    test "should be able to report current status" do
+      assert @server.status.is_a?(Hash)
+    end
   end
 
   class RedisConfigurationServerInvalidationTest < Test::Unit::TestCase

data/test/beetle/redis_ext_test.rb

@@ -68,11 +68,17 @@ module Beetle
 
     # if this test fails after upgrading redis, we can probably remove
     # our custom shutdown method from redis_ext.rb
-    test "redis shutdown implementation is broken" do
+    test "orginal redis shutdown implementation is broken" do
       @r.client.expects(:call_without_reply).with([:shutdown]).once
       @r.client.expects(:disconnect).never
       @r.broken_shutdown
     end
+
+    test "patched redis shutdown implementation should call :shutdown and rescue Errno::ECONNREFUSED" do
+      @r.client.expects(:call).with([:shutdown]).once.raises(Errno::ECONNREFUSED)
+      @r.client.expects(:disconnect).once
+      @r.shutdown
+    end
   end
 
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 15424043
+  hash: 15424053
   prerelease: 6
   segments: 
   - 0
   - 3
   - 0
   - rc
-  - 7
-  version: 0.3.0.rc.7
+  - 8
+  version: 0.3.0.rc.8
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 +02:00
+date: 2011-10-29 00:00:00 +02:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -153,9 +153,25 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: eventmachine_httpserver
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
+        version: 0.2.1
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -167,11 +183,11 @@ dependencies:
         - 10
         version: 1.0.10
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -183,11 +199,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -197,11 +213,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -211,11 +227,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -227,11 +243,11 @@ dependencies:
         - 2
         version: 0.7.2
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: daemon_controller
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -241,7 +257,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
 executables: 
@@ -266,7 +282,6 @@ files:
 - examples/redundant.rb
 - examples/rpc.rb
 - examples/simple.rb
-- examples/test_publisher.rb
 - lib/beetle/base.rb
 - lib/beetle/client.rb
 - lib/beetle/commands/configuration_client.rb
@@ -280,6 +295,7 @@ files:
 - lib/beetle/publisher.rb
 - lib/beetle/r_c.rb
 - lib/beetle/redis_configuration_client.rb
+- lib/beetle/redis_configuration_http_server.rb
 - lib/beetle/redis_configuration_server.rb
 - lib/beetle/redis_ext.rb
 - lib/beetle/redis_master_file.rb
@@ -298,6 +314,7 @@ files:
 - features/support/test_daemons/redis_configuration_client.rb
 - features/support/test_daemons/redis_configuration_server.rb
 - script/console
+- script/console~
 - script/start_rabbit
 - beetle.gemspec
 - Rakefile

data/examples/test_publisher.rb

@@ -1,32 +0,0 @@
-# attempts.rb
-# this example shows you how to use the exception limiting feature of beetle
-# it allows you to control the number of retries your handler will go through
-# with one message before giving up on it
-#
-# ! check the examples/README.rdoc for information on starting your redis/rabbit !
-#
-# start it with ruby attempts.rb
-
-require "rubygems"
-require File.expand_path("../lib/beetle", File.dirname(__FILE__))
-require "eventmachine"
-
-# set Beetle log level to info, less noisy than debug
-Beetle.config.logger.level = Logger::INFO
-
-# setup client
-client = Beetle::Client.new
-client.register_message(:test)
-
-n = 0
-EM.run do
-  EM.add_periodic_timer(0.1) do
-    data = (n+=1)
-    client.logger.info "publishing #{data}"
-    client.publish(:test, data)
-  end
-  trap("INT") do
-    client.stop_publishing
-    EM.stop_event_loop
-  end
-end