beetle 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad7f15bcc3fc114046b8b145690fa981063556e9
-  data.tar.gz: 9ff40b62cb8df60c788a940c70c59a8daa200443
+  metadata.gz: e3bc6495593a123c118fea16b8c9ae46c938dde1
+  data.tar.gz: 7f669e64e8369dd0cbe253a59200b9aab15d7334
 SHA512:
-  metadata.gz: 657f1cd730ec4e339f77cd23037af84f8809fdd2166b4ab5b16e879121149c976dd465c4bd84a7a40eec1c0bacb500d29e01c8921939e5b3228800f08375f461
-  data.tar.gz: 1c1faeda610d8fc937ff63a4e7c664be4971e329f00bd120a857e8ec732450fb194c9d9cad5885b4bc8fc04dab005bbf6d72868308c8f020cad2a154a14db9e9
+  metadata.gz: 78eeefefc0f8726363c1e396625542f48e21f1bfba9a4e748d4669c4c5ebd718fdd3b2a7dfaf15333fc7a8c7205c528e9fbb8d13e7fad7a0a71a57010e40b3a0
+  data.tar.gz: f99c20a06c42abe3a645ae04529789b738562e6b466c977d0f990fbc799a9f7ee1ea3cee7ee4971d3eded438a7eac9cad7882ea78f32fdfd4a226521d3beaea4

data/lib/beetle/client.rb

@@ -267,6 +267,18 @@ module Beetle
       end
     end
 
+    def reset
+      stop_publishing if @publisher
+      stop_listening if @subscriber
+      config.reload
+    rescue Exception => e
+      logger.warn("Error resetting client")
+      logger.warn(e)
+    ensure
+      @publisher = nil
+      @subscriber = nil
+    end
+
     private
 
     def determine_queue_names(queues)

data/lib/beetle/configuration.rb

@@ -58,6 +58,14 @@ module Beetle
     # external config file (defaults to <tt>no file</tt>)
     attr_reader :config_file
 
+    # returns the configured amqp brokers
+    def brokers
+      {
+        'servers' => self.servers,
+        'additional_subscription_servers' => self.additional_subscription_servers
+      }
+    end
+
     def initialize #:nodoc:
       self.system_name = "system"
 
@@ -90,6 +98,12 @@ module Beetle
       load_config
     end
 
+    # reloads the configuration from the configuration file
+    # if one is configured
+    def reload
+      load_config if @config_file
+    end
+
     def logger
       @logger ||=
         begin
@@ -103,7 +117,12 @@ module Beetle
 
     private
     def load_config
-      hash = YAML::load(ERB.new(IO.read(config_file)).result)
+      raw = ERB.new(IO.read(config_file)).result
+      hash = if config_file =~ /\.json$/
+               JSON.parse(raw)
+             else
+               YAML.load(raw)
+             end
       hash.each do |key, value|
         send("#{key}=", value)
       end

data/lib/beetle/redis_configuration_http_server.rb

@@ -39,12 +39,26 @@ module Beetle
         server_status(response, "plain")
       when '/initiate_master_switch'
         initiate_master_switch(response)
+      when '/brokers'
+        list_brokers(response)
       else
         not_found(response)
       end
       response.send_response
     end
 
+    def list_brokers(response)
+      brokers = config_server.config.brokers
+      response.status = 200
+      if @http_headers =~ %r(application/json)
+        response.content_type 'application/json'
+        response.content = brokers.to_json
+      else
+        response.content_type 'text/yaml'
+        response.content = brokers.to_yaml
+      end
+    end
+
     def server_status(response, type)
       response.status = 200
       status = config_server.status

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

data/test/beetle/client_test.rb

@@ -204,6 +204,25 @@ module Beetle
   end
 
   class ClientTest < MiniTest::Unit::TestCase
+    test "#reset should stop subscriber and publisher" do
+      client = Client.new
+      client.send(:publisher).expects(:stop)
+      client.send(:subscriber).expects(:stop!)
+      client.reset
+    end
+
+    test "#reset should reload the configuration" do
+      client = Client.new
+      client.config.expects(:reload)
+      client.reset
+    end
+
+    test "#reset should not propagate exceptions" do
+      client = Client.new
+      client.expects(:config).raises(ArgumentError)
+      client.reset
+    end
+
     test "instantiating a client should not instantiate the subscriber/publisher" do
       Publisher.expects(:new).never
       Subscriber.expects(:new).never

data/test/beetle/configuration_test.rb

@@ -32,5 +32,40 @@ module Beetle
       Logger.expects(:new).with(file).returns(stub_everything)
       config.logger
     end
+
+    test "#brokers returns a hash of the configured brokers" do
+      config = Configuration.new
+      assert_equal({"servers"=>"localhost:5672", "additional_subscription_servers"=>""}, config.brokers)
+    end
+
+    test "#config_file can be a JSON file" do
+      file = '/path/to/file.json'
+      config = Configuration.new
+      IO.expects(:read).with(file).returns(
+        {
+          servers: 'localhost:5772',
+          additional_subscription_servers: '10.0.0.1:3001'
+        }.to_json)
+
+      config.config_file = file
+
+      assert_equal "localhost:5772", config.servers
+      assert_equal "10.0.0.1:3001", config.additional_subscription_servers
+    end
+
+    test "#config_file can be a YAML file" do
+      file = '/path/to/file.yml'
+      config = Configuration.new
+      IO.expects(:read).with(file).returns(
+        {
+          servers: 'localhost:5772',
+          additional_subscription_servers: '10.0.0.1:3001'
+        }.to_yaml)
+
+      config.config_file = file
+
+      assert_equal "localhost:5772", config.servers
+      assert_equal "10.0.0.1:3001", config.additional_subscription_servers
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r