prometheus-splash 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66529d2675de97b1938780ea84806295f26a826dd7e05fbe3132c6e125fa6934
-  data.tar.gz: a137a6c2a50f06dc6ce9c03e23ab62e3268fdfc2d166ddcc494d30b33609e3db
+  metadata.gz: 7f4ea7ed10be999a00e43e04651616be5db143bbc0d85c11a1ca7126ad68aa33
+  data.tar.gz: dd66e18d9c1633033142b94852f3af61b066dd3dbc80de451f733b379e797203
 SHA512:
-  metadata.gz: a91247f76572495354be94bb57a9d1c4d26f58eec91b5c28a0e244c3e3a66df2e987dc39031a6323c8e9eb16739f7f382614312cb89473da98f9e04a96e04f00
-  data.tar.gz: 1472ea5a558e52ca43e8d893037a4b7f540920ac28e5fd9df156bad66540374cb8e61ef6166d37856ab59b4fa21c0e592ade34ef56013a15f48a920f43429add
+  metadata.gz: d923826528d62549cf890121e20474d13e5b88e1d8da3e8bf3136ef3232dd4a92b0bf11a6b4d07817786f192dc7e50e6f018d0611e544fafd906d7b7f8e9f79d
+  data.tar.gz: 3fec4f6263749824d308f1bbbeabf7dbd7ab5bef5f025ec921f0cef0f2ebd0b32584a117550091344b26dcf257cf0ed10fb7d6dbfd887ff8502468595d5ca578

data/CHANGELOG.md

@@ -55,4 +55,11 @@
 
 ### DOC :
 
-* prepare Vagrantfile and Ansible playbook 
+* prepare Vagrantfile and Ansible playbook
+
+
+## V 0.4.5 2020/04/17
+
+### FIX :
+
+* RabbitMQ Exception catching + refacto connection #31  

data/lib/splash/constants.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 module Splash
   module Constants
-    VERSION = "0.4.4"
+    VERSION = "0.4.5"
 
     # the path to th config file, not overridable by config
     CONFIG_FILE = "/etc/splash.yml"

data/lib/splash/transports/rabbitmq.rb

@@ -11,17 +11,16 @@ module Splash
 
         def initialize(options = {})
           @config = get_config.transports
-          @url = "amqp://"
+
           host = @config[:rabbitmq][:host]
           port = @config[:rabbitmq][:port]
-          vhost = @config[:rabbitmq][:vhost]
-          if @config[:rabbitmq][:user] and @config[:rabbitmq][:passwd] then
-            creds = "#{@config[:rabbitmq][:user]}:#{@config[:rabbitmq][:passwd]}@"
-            @url << creds
-          end
-          @url << "#{host}:#{port}#{vhost}"
+          vhost = (@config[:rabbitmq][:vhost])? @config[:rabbitmq][:vhost] : '/'
+          passwd = (@config[:rabbitmq][:passwd])? @config[:rabbitmq][:passwd] : 'guest'
+          user = (@config[:rabbitmq][:user])? @config[:rabbitmq][:user] : 'guest'
+          conf  = { :host => host, :vhost => vhost, :user => user, :password => passwd, :port => port.to_i}
+
           begin
-            @connection = Bunny.new @url
+            @connection = Bunny.new conf
             @connection.start
             @channel = @connection.create_channel
             @queue    = @channel.queue options[:queue]
@@ -41,21 +40,19 @@ module Splash
 
         def initialize
           @config = get_config.transports
-          @url = "amqp://"
           host = @config[:rabbitmq][:host]
           port = @config[:rabbitmq][:port]
-          vhost = @config[:rabbitmq][:vhost]
-          if @config[:rabbitmq][:user] and @config[:rabbitmq][:passwd] then
-            creds = "#{@config[:rabbitmq][:user]}:#{@config[:rabbitmq][:passwd]}@"
-            @url << creds
-          end
-          @url << "#{host}:#{port}#{vhost}"
+          vhost = (@config[:rabbitmq][:vhost])? @config[:rabbitmq][:vhost] : '/'
+          passwd = (@config[:rabbitmq][:passwd])? @config[:rabbitmq][:passwd] : 'guest'
+          user = (@config[:rabbitmq][:user])? @config[:rabbitmq][:user] : 'guest'
+          conf  = { :host => host, :vhost => vhost, :user => user, :password => passwd, :port => port.to_i}
+
           begin
-            @connection = Bunny.new @url
+            @connection = Bunny.new conf 
             @connection.start
             @channel = @connection.create_channel
           rescue Bunny::Exception
-            return  { :case => :service_dependence_missing, :more => "RabbitMQ Transport not available." }
+            splash_exit  case: :service_dependence_missing, more: "RabbitMQ Transport not available."
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Romain GEORGES