pushyd 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf480c7c62d3a53870416ec77b427dd66dd0576
-  data.tar.gz: 1de20b6c29e3aca9aef05a616bc28ae27f4a42d9
+  metadata.gz: 40d8b0ca991da2673c872f8dd20865c9c8423a1f
+  data.tar.gz: fd793ad3c7c38d72eeca44fd7aa2a09ad965fc8b
 SHA512:
-  metadata.gz: c3d64b444baa8cabd798e29933e214f3731a46439583014e35ded348d6e9f75a4132eb9d446b92aee14dcf310e8b1746f3dc4e2758374924fd6c11f0c246bfb2
-  data.tar.gz: d2e5425547396b6e048d9c264a13ed63d00ac965d92b71f6cdd77a591dce731fab720d6eb8d1de9e957c1d9888aab74dd7cd81a8ca9f9fe3d93a9fe8ce1a4af4
+  metadata.gz: 490dd865467775ff6f9b3b8a588636c3f7192cb135305583c05cb24e0f6185051294dcf61a475c148dc39f64d3842b37a810c12c57090297c00f4bd94ea4a711
+  data.tar.gz: db8fb4341181f1fd9690df6d7da85a2567a3d1a280c25e7ae20f294430bc5feea549b7c728ce8a8bedaaa50691954118b841b3ece08434f63dc0a89ce5cc483b

data/defaults.yml

@@ -12,7 +12,7 @@ logs:
 
 shout:
   topic: pushyd
-  period: 10
+  period: 10.0
   keys:
     - tic
     - tac

data/lib/pushyd/consumer.rb

@@ -5,28 +5,21 @@ module PushyDaemon
   # class ShouterInterrupted         < StandardError; end
   class ConsumerError              < StandardError; end
   class ConsumerRuleMissing        < StandardError; end
+  class ConsumerSubscribeError     < StandardError; end
 
   class Consumer < BmcDaemonLib::MqConsumer
     #include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
     include Shared::HmacSignature
-    attr_accessor :logger
 
-    def initialize(conn, rule_name, rule)
+    def initialize(channel, rule_name, rule)
+      # Init MqConsumer
+      log_pipe :consumer
+      super
+
       # Init
       @queue = nil
-      @conn = conn
       @rule = rule
       @rule_name = rule_name
-
-      # Prepare logger
-      log_pipe :consumer
-
-      # Create channel, prefetch only one message at a time
-      @channel = @conn.create_channel
-      @channel.prefetch(AMQP_PREFETCH)
-
-      # OK
-      log_info "Consumer initialized"
     end
 
   protected
@@ -135,7 +128,7 @@ module PushyDaemon
 
     # rescue StandardError => ex
     #   log_debug "channel_ackit[#{@channel.id}.#{tag}]: exception: #{ex.inspect}"
-    #   # fail PushyDaemon::EndpointSubscribeError, "unhandled (#{e.inspect})"
+    #   # fail PushyDaemon::ConsumerSubscribeError, "unhandled (#{e.inspect})"
 
     # else
     #   log_debug "channel_ackit[#{@channel.id}.#{tag}]: done"
@@ -144,6 +137,5 @@ module PushyDaemon
     # NewRelic instrumentation
     #add_transaction_tracer :receive,        category: :task
     #add_transaction_tracer :propagate,      category: :task
-
   end
 end

data/lib/pushyd/proxy.rb

@@ -4,6 +4,10 @@ require 'rest_client'
 require 'terminal-table'
 
 module PushyDaemon
+  class EndpointConnexionContext    < StandardError; end
+  class ProxyConnectionError     < StandardError; end
+  class ProxyConsumerError    < StandardError; end
+
   class Proxy < BmcDaemonLib::MqEndpoint
     #include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
@@ -25,11 +29,10 @@ module PushyDaemon
       @logger = BmcDaemonLib::LoggerPool.instance.get
 
       # Start connexion to RabbitMQ
-      @conn = connect_to BmcDaemonLib::Conf[:broker]
-      log_info "Proxy connected"
+      connect_to BmcDaemonLib::Conf[:broker]
 
       # Create a new shouter
-      @shouter = create_shouter
+      create_shouter
 
       # Check config and subscribe rules
       create_consumers
@@ -42,10 +45,10 @@ module PushyDaemon
       @shouter.start_loop
 
       rescue BmcDaemonLib::MqConsumerException => e
-        log_error "Proxy consumer: #{e.message}"
+        log_error "Proxy exception: #{e.message}"
         abort "EXITING #{e.class}: #{e.message}"
 
-      rescue ShouterInterrupted, EndpointConnectionError, Errno::EACCES => e
+      rescue ShouterInterrupted, ProxyConnectionError, Errno::EACCES => e
         log_error "Proxy error: #{e.message}"
         abort "EXITING #{e.class}: #{e.message}"
 
@@ -62,15 +65,14 @@ module PushyDaemon
       {
         me: :proxy
       }
-
     end
 
     def create_shouter
-      # Get config
-      config_shouter = BmcDaemonLib::Conf[:shout]
+      # Create my channel
+      channel = @conn.create_channel
 
       # Create the shouter
-      Shouter.new(@conn, config_shouter)
+      @shouter = Shouter.new(channel, BmcDaemonLib::Conf[:shout])
     end
 
     def create_consumers
@@ -104,13 +106,14 @@ module PushyDaemon
       end
 
       # Check we have a topic and at least one routing key
-      fail PushyDaemon::EndpointSubscribeContext, "rule [#{rule_name}] lacking topic" unless rule_topic
-      fail PushyDaemon::EndpointSubscribeContext, "rule [#{rule_name}] lacking keys" if rule_keys.empty?
+      fail BmcDaemonLib::ProxyConsumerError, "rule [#{rule_name}] lacking topic" unless rule_topic
+      fail BmcDaemonLib::ProxyConsumerError, "rule [#{rule_name}] lacking keys" if rule_keys.empty?
 
-      # Build a new consumer
-      consumer = Consumer.new(@conn, rule_name, rule)
+      # Build a new consumer on its own channel
+      channel = @conn.create_channel
+      consumer = Consumer.new(channel, rule_name, rule)
 
-      # Subscribe to my own queue
+      # Subscribe to its own queue
       consumer.subscribe_to_queue rule_queue, "rule:#{rule_name}"
 
       # Bind each key to exchange
@@ -140,5 +143,33 @@ module PushyDaemon
       log_error "consumer_cancelled remotely: #{all.inspect}"
     end
 
+    # Start connexion to RabbitMQ
+    def connect_to busconf
+      fail ProxyConnectionError, "connect_to/busconf" unless busconf
+      log_info "connect_to: connecting to broker", {
+        broker: busconf,
+        recover: AMQP_RECOVERY_INTERVAL,
+        heartbeat: AMQP_HEARTBEAT_INTERVAL,
+        prefetch: AMQP_PREFETCH
+        }
+      @conn = Bunny.new busconf.to_s,
+        logger: @logger,
+        # heartbeat: :server,
+        automatically_recover: true,
+        network_recovery_interval: AMQP_RECOVERY_INTERVAL,
+        heartbeat_interval: AMQP_HEARTBEAT_INTERVAL,
+        read_write_timeout: AMQP_HEARTBEAT_INTERVAL*2
+
+      # Start the connection
+      @conn.start
+
+    rescue Bunny::TCPConnectionFailedForAllHosts, Bunny::AuthenticationFailureError, AMQ::Protocol::EmptyResponseError  => e
+      fail ProxyConnectionError, "error connecting (#{e.class})"
+    rescue StandardError => e
+      fail ProxyConnectionError, "unknow (#{e.inspect})"
+    else
+      #return conn
+    end
+
   end
 end

data/lib/pushyd/shouter.rb

@@ -7,20 +7,19 @@ module PushyDaemon
 
   class Shouter < BmcDaemonLib::MqEndpoint
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-    include BmcDaemonLib::LoggerHelper
+    include LoggerHelper
+    attr_accessor :logger
 
     # Class options
     attr_accessor :table
-    attr_accessor :logger
 
-    def initialize(conn, config_shout)
+    def initialize(channel, config_shout)
+      # Init MqConsumer
+      log_pipe :shouter
+      super
+
       # Init
       @shouter_keys = []
-      @channel = nil
-      @exchange = nil
-
-      # Prepare logger
-      log_pipe :shouter
 
       # Check config
       unless config_shout && config_shout.any? && config_shout.is_a?(Enumerable)
@@ -31,20 +30,22 @@ module PushyDaemon
       # Extract information
       @shouter_keys = config_shout[:keys] if config_shout[:keys].is_a? Array
       @shouter_topic = config_shout[:topic]
-      @shouter_period = config_shout[:period].to_i
+      @shouter_period = config_shout[:period].to_f
       @shouter_period = 1 unless (@shouter_period > 0)
 
       fail PushyDaemon::EndpointTopicContext unless @shouter_topic
 
-      # Create channel and exchange
-      @channel = conn.create_channel
+      # Create exchange
       @exchange = @channel.topic(@shouter_topic, durable: true, persistent: true)
+      #log_info "channel[#{@channel.id}] created, prefetch[#{AMQP_PREFETCH}]"
 
       # Start working, now
-      log_info "Shouter initialized, starting loop now", { topic: @shouter_topic, period: @shouter_period, keys: @shouter_keys }
+      log_info "shouter initialized"
     end
 
     def start_loop
+      log_info "shouter start_loop", { topic: @shouter_topic, period: @shouter_period, keys: @shouter_keys }
+
       # Prepare exchange
       loop do
         # Generate payload

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.25.0"
+  spec.version                      = "0.26.0"
 
   # Project description
   spec.name                         = "pushyd"
@@ -28,7 +28,8 @@ Gem::Specification.new do |spec|
   # spec.add_development_dependency "pry"
 
   # Runtime dependencies
-  spec.add_runtime_dependency       "bmc-daemon-lib", "= 0.9.2"
+  # spec.add_runtime_dependency       "bmc-daemon-lib"
+  spec.add_runtime_dependency       "bmc-daemon-lib", "= 0.10.0"
   spec.add_runtime_dependency       "daemons"
   spec.add_runtime_dependency       "json"
   spec.add_runtime_dependency       "bunny", "~> 2.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement