hutch 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a85a84008f00348fd3416e1067d5edc68dce0b50
-  data.tar.gz: 195ad53e080145096107e8c418f40c724918299e
+  metadata.gz: c16188d79e67f6645279e39fc3a628d70ebb2468
+  data.tar.gz: c82d50ef75cda6ac8482e66a561c9db6175166ec
 SHA512:
-  metadata.gz: 1d70d2c0c9ca01d0786840e258b6652c396b220e88b87dbff53e6241aa2e4490babd2a274e385e44b988a5380c129acefc13a8c96caa4e46ec12520c99918e9d
-  data.tar.gz: 43aa778b97d94fcb778b901c9f0fac74d48c8ae098274811ac068288df497431f8adbb0e514a395c936eed605dffea54e97c375a97be24bdfc3f0761b016dcd1
+  metadata.gz: 8d264879570aa9a3b7493ac5fdf9aa9739780073a6b6649cec0d9bced34a1558e677bc2f17c543cd9cdaab493d43e82d68da275668d16d74b42c61af7447990d
+  data.tar.gz: 6eb7f683f37389a6263bc8de520dc34084007d1cafe1ba11f6510be37bc02c3f05827dd9cbc1f4552570c8d1f81c7fd972ccc691a65ae09acd9c12f18cd797c0

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-## 0.12.0 — unreleased
+## 0.13.0 — Dec 5th, 2014
+
+### HTTP API Can Be Disabled for Consumers
+
+HTTP API use can be disabled for consumers using the `:enable_http_api_use` config
+option (defaults to true).
+
+
+
+## 0.12.0 — Nov 25th, 2014
 
 ### Explicit Requires
 

data/lib/hutch/broker.rb

@@ -15,8 +15,14 @@ module Hutch
     end
 
     def connect(options = {})
+      @options = options
       set_up_amqp_connection
-      set_up_api_connection if options.fetch(:enable_http_api_use, true)
+      if http_api_use_enabled?
+        logger.info "HTTP API use is enabled"
+        set_up_api_connection
+      else
+        logger.info "HTTP API use is disabled"
+      end
 
       if block_given?
         begin
@@ -59,22 +65,27 @@ module Hutch
         @config[:mq_password] = u.password
       end
 
-      host     = @config[:mq_host]
-      port     = @config[:mq_port]
-      vhost    = @config[:mq_vhost]
-      username = @config[:mq_username]
-      password = @config[:mq_password]
-      tls      = @config[:mq_tls]
-      tls_key  = @config[:mq_tls_key]
-      tls_cert = @config[:mq_tls_cert]
-      protocol = tls ? "amqps://" : "amqp://"
-      sanitized_uri = "#{protocol}#{username}@#{host}:#{port}/#{vhost.sub(/^\//, '')}"
+      host               = @config[:mq_host]
+      port               = @config[:mq_port]
+      vhost              = if @config[:mq_vhost] && "" != @config[:mq_vhost]
+                             @config[:mq_vhost]
+                           else
+                             Bunny::Session::DEFAULT_VHOST
+                           end
+      username           = @config[:mq_username]
+      password           = @config[:mq_password]
+      tls                = @config[:mq_tls]
+      tls_key            = @config[:mq_tls_key]
+      tls_cert           = @config[:mq_tls_cert]
+      connection_timeout = @config[:connection_timeout]
+      protocol           = tls ? "amqps://" : "amqp://"
+      sanitized_uri      = "#{protocol}#{username}@#{host}:#{port}/#{vhost.sub(/^\//, '')}"
       logger.info "connecting to rabbitmq (#{sanitized_uri})"
       @connection = Bunny.new(host: host, port: port, vhost: vhost,
                               tls: tls, tls_key: tls_key, tls_cert: tls_cert,
                               username: username, password: password,
                               heartbeat: 30, automatically_recover: true,
-                              network_recovery_interval: 1)
+                              network_recovery_interval: 1, connection_timeout: connection_timeout)
 
       with_bunny_connection_handler(sanitized_uri) do
         @connection.start
@@ -111,6 +122,17 @@ module Hutch
       end
     end
 
+    def http_api_use_enabled?
+      op = @options.fetch(:enable_http_api_use, true)
+      cf = if @config[:enable_http_api_use].nil?
+             true
+           else
+             @config[:enable_http_api_use]
+           end
+
+      op && cf
+    end
+
     # Create / get a durable queue and apply namespace if it exists.
     def queue(name)
       with_bunny_precondition_handler('queue') do
@@ -136,12 +158,14 @@ module Hutch
     # existing bindings on the queue that aren't present in the array of
     # routing keys will be unbound.
     def bind_queue(queue, routing_keys)
-      # Find the existing bindings, and unbind any redundant bindings
-      queue_bindings = bindings.select { |dest, keys| dest == queue.name }
-      queue_bindings.each do |dest, keys|
-        keys.reject { |key| routing_keys.include?(key) }.each do |key|
-          logger.debug "removing redundant binding #{queue.name} <--> #{key}"
-          queue.unbind(@exchange, routing_key: key)
+      if http_api_use_enabled?
+        # Find the existing bindings, and unbind any redundant bindings
+        queue_bindings = bindings.select { |dest, keys| dest == queue.name }
+        queue_bindings.each do |dest, keys|
+          keys.reject { |key| routing_keys.include?(key) }.each do |key|
+            logger.debug "removing redundant binding #{queue.name} <--> #{key}"
+            queue.unbind(@exchange, routing_key: key)
+          end
         end
       end
 
@@ -270,7 +294,7 @@ module Hutch
       yield
     rescue Bunny::TCPConnectionFailed => ex
       logger.error "amqp connection error: #{ex.message.downcase}"
-      raise ConnectionError.new("couldn't connect to rabbitmq at #{uri}")
+      raise ConnectionError.new("couldn't connect to rabbitmq at #{uri}. Check your configuration, network connectivity and RabbitMQ logs.")
     end
 
     def work_pool_threads

data/lib/hutch/config.rb

@@ -37,7 +37,10 @@ module Hutch
         publisher_confirms: false,
         # like `publisher_confirms` above but also
         # forces waiting for a confirm for every publish
-        force_publisher_confirms: false
+        force_publisher_confirms: false,
+        # Heroku needs > 10. MK.
+        connection_timeout: 11,
+        enable_http_api_use: true
       }.merge(params)
     end
 

data/lib/hutch/version.rb

@@ -1,4 +1,4 @@
 module Hutch
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.13.0'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hutch
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny