pushyd 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ba6f2c7c7310e2767380a940d9c7416f1ac87fc
-  data.tar.gz: c9db478c51b6d7f77bb385bcb96e847181b9ca86
+  metadata.gz: b4b7747634e7a6e9d73b5247b453168994d6f642
+  data.tar.gz: 9731350abaec6a877a8a300fc5bb9906141431e9
 SHA512:
-  metadata.gz: d7dcb8428586078ce08b30c7ce978d377c71889af1ae745ca00490288724dc9dd2830ef36fe5c2f85e01063a5637dd270110e4fa851a203ea6e97a03257810a2
-  data.tar.gz: 0f7156adeb70165a7753fa7d676db908b6aaf4d918b70f50e892234517264c5cbfd6a0cea35c80e498ee9b42148596c8dccad157dce3ffc4b77cbb9bce9980f0
+  metadata.gz: 3908366de3c57747703d9734b815507f63c6bb9f29e9f7475ec68170d7f4ced9147d986e1dabcd0a5d45b0a34d41ef6a8f8f3f9d75e20e4b055d40aead8e5e52
+  data.tar.gz: 04f876be6118ef9c0211d44b8f98aa3f8af0cf9251a0bb8dd7146eb6492bd371f50c526923e8b64a5dfd7e5df866df0fbcc972bb0f345c5aac567e05e97a814b

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    pushyd (0.23.0)
+    pushyd (0.24.0)
       api-auth
-      bmc-daemon-lib (~> 0.5.0)
+      bmc-daemon-lib (~> 0.5.1)
       bunny (~> 2.3)
       daemons
       json
@@ -15,11 +15,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     amq-protocol (2.0.1)
     api-auth (2.0.1)
     ast (2.3.0)
-    bmc-daemon-lib (0.5.0)
+    bmc-daemon-lib (0.5.1)
       chamber (~> 2.9.1)
     bunny (2.6.1)
       amq-protocol (>= 2.0.1)
@@ -28,7 +29,7 @@ GEM
       thor (~> 0.19.1)
     daemons (1.2.4)
     diff-lcs (1.2.5)
-    domain_name (0.5.20160826)
+    domain_name (0.5.20161021)
       unf (>= 0.0.5, < 1.0.0)
     hashie (3.4.6)
     http (2.0.3)
@@ -48,6 +49,7 @@ GEM
     parser (2.3.1.4)
       ast (~> 2.2)
     powerpack (0.1.1)
+    public_suffix (2.0.4)
     rainbow (2.1.0)
     rake (11.3.0)
     rest-client (1.8.0)
@@ -69,7 +71,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.44.1)
+    rubocop (0.45.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)

data/bin/pushyd

@@ -42,9 +42,9 @@ begin
   Conf[:logs][:file] = cmd_logfile.to_s if cmd_logfile
 
 rescue OptionParser::InvalidOption => e
-  abort "EXITING: InvalidOption: #{e.message} \n #{e.backtrace.to_yaml}"
+  abort "EXITING: InvalidOption: #{e.message}"
 rescue ConfigParseError => e
-  abort "EXITING: ConfigParseError: #{e.message} \n #{e.backtrace.to_yaml}"
+  abort "EXITING: ConfigParseError: #{e.message}"
 rescue StandardError => e
   abort "EXITING: StandardError: #{e.message} \n #{e.backtrace.to_yaml}"
 else

data/lib/pushyd/proxy.rb

@@ -12,13 +12,13 @@ module PushyDaemon
 
     def initialize
       # Init
-      @shouters = []
+      @shouter = nil
       @consumers = []
 
       # Init ASCII table
       @table = Terminal::Table.new
-      @table.title = "Propagation rules"
-      @table.headings = ["rule", "topic", "route", "relay", "created queue", "description"]
+      @table.title = "Rules summary"
+      @table.headings = ["rule", "topic", "route", "relay", "description", "status"]
       @table.align_column(5, :right)
 
       # Prepare logger
@@ -28,6 +28,9 @@ module PushyDaemon
       @conn = connect_to BmcDaemonLib::Conf[:broker]
       log_info "Proxy connected"
 
+      # Create a new shouter
+      @shouter = create_shouter
+
       # Check config and subscribe rules
       create_consumers
 
@@ -35,19 +38,21 @@ module PushyDaemon
       log_info "Proxy initialized", @table.to_s
       puts @table.to_s
 
+      # Make the shouter loop!
+      @shouter.start_loop
 
-      # Create a new shouter, and start its loop
-      create_shouter
+      rescue BmcDaemonLib::MqConsumerException => e
+        log_error "Proxy consumer: #{e.message}"
+        abort "EXITING #{e.class}: #{e.message}"
 
-      rescue BmcDaemonLib::MqConsumerException, EndpointConnectionError, ShouterInterrupted, Errno::EACCES => e
-        log_error "Proxy: #{e.message}"
+      rescue ShouterInterrupted, EndpointConnectionError, Errno::EACCES => e
+        log_error "Proxy error: #{e.message}"
         abort "EXITING #{e.class}: #{e.message}"
 
       rescue StandardError => e
-        log_error "Proxy: #{e.message}", e.backtrace
+        log_error "Proxy unexpected: #{e.message}", e.backtrace
         abort "EXITING #{e.class}: #{e.message} \n #{e.backtrace.to_yaml}"
-
-        raise MqConsumerException, e.message
+        # raise MqConsumerException, e.message
 
     end
 
@@ -65,11 +70,7 @@ module PushyDaemon
       config_shouter = BmcDaemonLib::Conf[:shout]
 
       # Create the shouter
-      shouter = Shouter.new(@conn, config_shouter)
-      @shouters << shouter
-
-      # Now make it loop
-      shouter.start_loop
+      Shouter.new(@conn, config_shouter)
     end
 
     def create_consumers
@@ -84,7 +85,7 @@ module PushyDaemon
       # Subscribe for each and every rule/route
       config_rules.each do |name, rule|
         rule[:name] = name
-        create_consumer rule
+        @consumers << create_consumer(rule)
       end
     end
 
@@ -102,19 +103,25 @@ module PushyDaemon
       # Build a new consumer
       consumer = Consumer.new(@conn, rule_name, rule)
 
-      # Create its own queue
+      # Subscribe to my own queue
       consumer.subscribe_to_queue rule_queue, "rule:#{rule_name}"
 
       # Bind each route to exchange
       rule_routes.each do |route|
-        consumer.listen_to rule_topic, route
+        begin
+          status = "> #{rule_queue}"
+          consumer.listen_to rule_topic, route
+        rescue BmcDaemonLib::MqConsumerTopicNotFound => e
+          status = "! BIND FAILED"
+          log_error "Proxy consumer: #{e.message}"
+        end
 
         # Add row to config table
-        @table.add_row [rule_name, rule_topic, route, rule[:relay].to_s, rule_queue, rule[:title].to_s ]
+        @table.add_row [rule_name, rule_topic, route, rule[:relay].to_s, rule[:title].to_s, status ]
       end
 
-      # Return it
-      @consumers << consumer
+      # Return consumer
+      consumer
     end
 
     def consumer_cancelled all={}

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.23.0"
+  spec.version                      = "0.24.0"
 
   # Project description
   spec.name                         = "pushyd"
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   # spec.add_development_dependency "pry"
 
   # Runtime dependencies
-  spec.add_runtime_dependency       "bmc-daemon-lib", "~> 0.5.0"
+  spec.add_runtime_dependency       "bmc-daemon-lib", "~> 0.5.1"
   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.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement