pushyd 0.24.1 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c0b26eba48301767a70e3cfaca254a849500f06
-  data.tar.gz: 6133a4c4035b49738d644bc835f14d35cd261ac8
+  metadata.gz: 1bf480c7c62d3a53870416ec77b427dd66dd0576
+  data.tar.gz: 1de20b6c29e3aca9aef05a616bc28ae27f4a42d9
 SHA512:
-  metadata.gz: 7acb3652db0038dc43b4a9653d2a7971a11e49db23af44e790908951d7fffa5f3970da6dde6f5b9b2dd7fb498bce1a0be26700e9fc1432c31d133962918d4b29
-  data.tar.gz: 9c989ff2fa8316b514fea66b31585de530815858f7619f7f209c7311c3dd47daa73f60d2d18b611a64f1305fac194cc906cd26e0a5da97ce0d9e8d7839ab908a
+  metadata.gz: c3d64b444baa8cabd798e29933e214f3731a46439583014e35ded348d6e9f75a4132eb9d446b92aee14dcf310e8b1746f3dc4e2758374924fd6c11f0c246bfb2
+  data.tar.gz: d2e5425547396b6e048d9c264a13ed63d00ac965d92b71f6cdd77a591dce731fab720d6eb8d1de9e957c1d9888aab74dd7cd81a8ca9f9fe3d93a9fe8ce1a4af4

data/.gitignore

@@ -8,3 +8,7 @@ DOC/
 .ruby-version
 local.yml
 /.idea
+
+Gemfile.lock
+.ruby-version
+.ruby-gemset

data/bin/pushyd

@@ -25,7 +25,7 @@ begin
 
   # Parse options and check compliance
   parser = OptionParser.new do |opts|
-    opts.banner = "Usage: #{File.basename $PROGRAM_NAME} [options] start|stop"
+    opts.banner = "Usage: #{File.basename $PROGRAM_NAME} [options] run|start|stop"
     opts.on("-l", "--log LOGFILE")                                  { |path| cmd_logfile = File.expand_path(path.to_s)}
     opts.on("-c", "--config CONFIGFILE")                            { |path| cmd_config = File.expand_path(path.to_s)}
     opts.on("-e", "--environment ENV")                              { |env| Conf.app_env = env }
@@ -56,9 +56,9 @@ puts "Environment     \t #{Conf.app_env}"
 puts "Config files    \t #{Conf.files}"
 puts "Started at      \t #{Conf.app_started}"
 puts "Loging to file  \t #{Conf[:log][:file]}" if Conf[:log].is_a? Enumerable
-puts "Process name    \t #{Conf.generate(:process_name)}"
-puts "Newrelic        \t #{Conf.feature?(:newrelic) || '-'}"
-puts "Rollbar         \t #{Conf.feature?(:rollbar) || '-'}"
+puts "Process name    \t #{Conf.generate_process_name}"
+puts "Newrelic        \t #{Conf.feature_newrelic? || '-'}"
+puts "Rollbar         \t #{Conf.feature_rollbar? || '-'}"
 if cmd_dump
   puts
   puts Conf.dump
@@ -73,7 +73,7 @@ monitor: false,
   dir_mode: :normal,
   dir: '/tmp/'
   }
-Daemons.run_proc(Conf.generate(:process_name), run_options) do
+Daemons.run_proc(Conf.generate_process_name, run_options) do
   # Load code
   Conf.prepare_newrelic
 

data/defaults.yml

@@ -34,7 +34,14 @@ rollbar:
 #   proxy_tests:
 #     title: All proxy tests messages
 #     topic: proxy
-#     routes: "proxy.#"
+#     keys: proxy.#
+#     keys: proxy.key1, proxy.key2, proxy.key3
+    # keys: 
+    #     - proxy.key1
+    #     - proxy.key2
+    #     - proxy.key3
+#     keys: "proxy.#"
+#     keys: "proxy.#"
 #     subscribe: false
 #     #relay: http://requestb.in/1clzv7v1
 

data/lib/pushyd/consumer.rb

@@ -90,7 +90,7 @@ module PushyDaemon
       headers = {
         content_type: :json,
         accept: :json,
-        user_agent: BmcDaemonLib::Conf.generate(:user_agent),
+        user_agent: BmcDaemonLib::Conf.generate_user_agent,
         }
 
       # Compute: payload MD5, HMAC signature

data/lib/pushyd/proxy.rb

@@ -18,7 +18,7 @@ module PushyDaemon
       # Init ASCII table
       @table = Terminal::Table.new
       @table.title = "Rules summary"
-      @table.headings = ["rule", "topic", "route", "relay", "description", "status"]
+      @table.headings = ["rule", "topic", "> queue", "> relay", "routing key", "bind status"]
       @table.align_column(5, :right)
 
       # Prepare logger
@@ -82,23 +82,30 @@ module PushyDaemon
       end
       log_info "create_consumers: #{config_rules.keys.join(', ')}"
 
-      # Subscribe for each and every rule/route
+      # Subscribe for each and every rule/key
       config_rules.each do |name, rule|
         rule[:name] = name
         @consumers << create_consumer(rule)
       end
     end
 
-    # Subscribe to interesting topic/routes and bind a listenner
+    # Subscribe to interesting topic/key and bind a listenner
     def create_consumer rule
       # Check information
       rule_name   = rule[:name].to_s
       rule_topic  = rule[:topic].to_s
-      rule_routes = rule[:routes].to_s.split(' ')
       rule_queue  = sprintf('%s-%s', BmcDaemonLib::Conf.app_name, rule_name.gsub('_', '-'))
 
+      # Extract routing keys
+      if rule[:keys].is_a? Array
+        rule_keys = rule[:keys].map(&:to_s)
+      else
+        rule_keys = rule[:keys].to_s.split(',').map(&:strip)
+      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 routes" if rule_routes.empty?
+      fail PushyDaemon::EndpointSubscribeContext, "rule [#{rule_name}] lacking keys" if rule_keys.empty?
 
       # Build a new consumer
       consumer = Consumer.new(@conn, rule_name, rule)
@@ -106,18 +113,23 @@ module PushyDaemon
       # Subscribe to my own queue
       consumer.subscribe_to_queue rule_queue, "rule:#{rule_name}"
 
-      # Bind each route to exchange
-      rule_routes.each do |route|
+      # Bind each key to exchange
+      rule_keys.each do |key|
         begin
-          status = "> #{rule_queue}"
-          consumer.listen_to rule_topic, route
-        rescue BmcDaemonLib::MqConsumerTopicNotFound => e
-          status = "! BIND FAILED"
-          log_error "Proxy consumer: #{e.message}"
+          q = consumer.listen_to rule_topic, key
+        rescue BmcDaemonLib::MqConsumerTopicNotFound,
+               BmcDaemonLib::MqConsumerException => e
+          status = "FAILED: #{e.class} \n#{e.message}"
+          log_error "create_consumer [#{e.class}] #{e.message}"
+        rescue StandardError => e
+          status = "FAILED: #{e.message}"
+          log_error "create_consumer: #{e.message}"
+        else
+          status = "QUEUE #{q.object_id}"
         end
 
         # Add row to config table
-        @table.add_row [rule_name, rule_topic, route, rule[:relay].to_s, rule[:title].to_s, status ]
+        @table.add_row [rule_name, rule_topic, rule_queue, rule[:relay].to_s, key, status ]
       end
 
       # Return consumer

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.24.1"
+  spec.version                      = "0.25.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.6.0"
+  spec.add_runtime_dependency       "bmc-daemon-lib", "= 0.9.2"
   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.24.1
+  version: 0.25.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: bmc-daemon-lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +217,6 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/pushyd

data/Gemfile.lock

@@ -1,101 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pushyd (0.24.1)
-      api-auth
-      bmc-daemon-lib (~> 0.6.0)
-      bunny (~> 2.3)
-      daemons
-      json
-      newrelic_rpm
-      rest-client (~> 1.8)
-      rollbar
-      terminal-table
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    amq-protocol (2.0.1)
-    api-auth (2.1.0)
-    ast (2.3.0)
-    bmc-daemon-lib (0.6.0)
-      chamber (~> 2.9.1)
-    bunny (2.6.2)
-      amq-protocol (>= 2.0.1)
-    chamber (2.9.1)
-      hashie (~> 3.3)
-      thor (~> 0.19.1)
-    daemons (1.2.4)
-    diff-lcs (1.2.5)
-    domain_name (0.5.20161129)
-      unf (>= 0.0.5, < 1.0.0)
-    hashie (3.4.6)
-    http (2.1.0)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 1.0.1)
-      http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (1.0.1)
-    http_parser.rb (0.6.0)
-    json (2.0.3)
-    mime-types (2.99.3)
-    multi_json (1.12.1)
-    netrc (0.11.0)
-    newrelic_rpm (3.17.2.327)
-    parser (2.3.3.1)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    public_suffix (2.0.5)
-    rainbow (2.2.1)
-    rake (12.0.0)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rollbar (2.14.0)
-      multi_json
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.47.0)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
-    thor (0.19.4)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
-    unicode-display_width (1.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.6)
-  http (~> 2.0)
-  pushyd!
-  rake
-  rspec
-  rubocop
-
-BUNDLED WITH
-   1.13.5