pushyd 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4362764bdd62d5694410dc03443d0c006e69fea2
-  data.tar.gz: f8e064d388c8812cc9ee8adf260e440ac0e04c01
+  metadata.gz: bef5122c9c7a8a4276bc0e1f735c48b65b88f156
+  data.tar.gz: 8620fcd2277aafc9ff97c6c65ec4abe25a6f5339
 SHA512:
-  metadata.gz: 0fed54ac476319821c9f2eb988e5a07e42c5a4f6af8b5a5ca6029727cbb73bd046760fadc3021c96b2af9e57446a7848c800c8d3bb22ff21cf36eab66a6366bb
-  data.tar.gz: b90ab861594caa453c0b5b5216c259be7d79d3ca190ff91a6c735df7442e096d63c6ae93f503d0d38cf7b6260325b33e19db682c9e0a5a67de381e5a3683b953
+  metadata.gz: dabd44f13d11e6167bb96b1e4c3d5c044bb0394ee386b3fe6ad84882339a518cf941d6f21aaab79090decd982511cbb1b1fe50ce5df124d70ee8d0487000a945
+  data.tar.gz: dc9779dfd1b20506840ccc799dbe5f8cac4d43daa30634ad4067a32a5a71b11b03dbdecdf4aa3a2075ba02195a6e40994da125cfb3208b8d234d4e2c6d765e38

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    pushyd (0.2.3)
+    pushyd (0.2.4)
       bunny
       chamber
       daemons
       json
-      rest_client
+      rest-client
       terminal-table
 
 GEM
@@ -37,14 +37,17 @@ GEM
     http-form_data (1.0.1)
     http_parser.rb (0.6.0)
     json (1.8.3)
-    netrc (0.7.9)
+    mime-types (2.99.2)
+    netrc (0.11.0)
     parser (2.3.1.2)
       ast (~> 2.2)
     powerpack (0.1.1)
     rainbow (2.1.0)
     rake (11.1.2)
-    rest_client (1.8.3)
-      netrc (~> 0.7.7)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)

data/bin/pushyd

@@ -18,20 +18,22 @@ APP_ROOT = File.expand_path(File.dirname(__FILE__) + "/../")
 begin
   # Defaults
   cmd_config = nil
+  cmd_logfile = nil
   cmd_env = "production"
   cmd_dump = false
 
   # Parse options and check compliance
   OptionParser.new do |opts|
     opts.banner = "Usage: #{File.basename $PROGRAM_NAME} [options] start|stop"
-    opts.on("-c", "--config CONFIGFILE")     { |config| cmd_config = File.expand_path(config)}
+    opts.on("-l", "--log LOGFILE")           { |path| cmd_logfile = File.expand_path(path)}
+    opts.on("-c", "--config CONFIGFILE")     { |path| cmd_config = File.expand_path(path)}
     opts.on("-e", "--environment ENV")       { |env| cmd_env = env }
     opts.on("-d", "--dump")                  { cmd_dump = true }
     opts.on("",   "--dev")                   { cmd_env = "development" }
   end.order!(ARGV)
 
   # Build Chamber-based configuration from Gemspec with initial context
-  Conf.prepare root: APP_ROOT, gemspec: "pushyd", env: cmd_env, config: cmd_config
+  Conf.prepare root: APP_ROOT, gemspec: "pushyd", env: cmd_env, config: cmd_config, log: cmd_logfile
 
   # Display final configuration
   puts "--- #{Conf.name} #{Conf.version}"
@@ -61,7 +63,7 @@ run_options = {
   }
 Daemons.run_proc('pushy-daemon', run_options) do
   # Load code
-  puts "--- loading code and logger"
+  puts "--- loading code"
   require_relative "../lib/pushyd"
 
   # Start daemon

data/lib/pushyd/conf.rb

@@ -43,6 +43,9 @@ module PushyDaemon
       # Try to access any key to force parsing of the files
       self[:dummy]
 
+      # Override some values
+      self[:log] = args[:log].to_s if args[:log]
+
     rescue Psych::SyntaxError => e
       raise PushyDaemon::ConfigParseError, e.message
 

data/lib/pushyd/constants.rb

@@ -19,5 +19,3 @@ LOG_NEWLINE             = "\n"
 LOG_INDENT              = "\t"
 LOG_ROTATION            = "daily"
 
-
-# Constants: shouter

data/lib/pushyd/proxy.orig.rb

@@ -0,0 +1,198 @@
+#!/usr/bin/env ruby
+require 'terminal-table'
+require 'hashie'
+require 'securerandom'
+
+# Log output
+def header rule, sign, topic, route
+  puts
+  puts SEPARATOR
+  puts sprintf "%s | %-20s %1s %-10s | %s",
+    DateTime.now.iso8601, rule, sign, topic, route
+  puts SEPARATOR
+end
+
+
+def extract ctype, payload, fields = []
+  # Force encoding (pftop...)
+  utf8payload = payload.force_encoding('UTF-8')
+
+  # Parse payload if content-type provided
+  case ctype
+    when "application/json"
+      # if fields = rule[:payload_extract]
+      #   data = payload_extract(payload, fields)
+      #   data_source = "extract #{fields.inspect} #{data.keys.count}k"
+      return JSON.parse utf8payload
+
+    when "text/plain"
+      return utf8payload.to_s
+
+    else
+      return utf8payload
+
+  end
+
+  # Handle body parse errors
+  rescue Encoding::UndefinedConversionError => e
+    puts "\t JSON PARSE ERROR: #{e.inspect}"
+    return {}
+
+end
+
+
+# def payload_extract payload, fields = []
+#     new_payload = payload.force_encoding('UTF-8')
+#     parsed = JSON.parse new_payload
+
+#   rescue Encoding::UndefinedConversionError => e
+#     puts "\t JSON PARSE ERROR: #{e.inspect}"
+#     return {}
+
+#   else
+#     return parsed
+# end
+
+
+
+# def handle_message rule_name, rule, delivery_info, metadata, payload
+#   # Prepare data
+#   msg_topic = delivery_info.exchange
+#   msg_rkey = delivery_info.routing_key.force_encoding('UTF-8')
+#   msg_headers = metadata.headers || {}
+
+#   # Extract fields
+#   data = extract metadata.content_type, payload, rule
+
+#   # Announce match
+#   header rule_name, "<", msg_topic, msg_rkey
+
+#   # Build notification payload
+#   body = {
+#     # received: msg_topic,
+#     exchange: msg_topic,
+#     route: msg_rkey,
+#     #headers: msg_headers,
+#     sent_at: msg_headers['sent_at'],
+#     sent_by: msg_headers['sent_by'],
+#     data: data,
+#     }
+#   pretty_body = JSON.pretty_generate(body)
+
+#   # Dump body data
+#   puts "RULE: #{rule.inspect}"
+#   puts "APP-ID: #{metadata.app_id}"
+#   puts "CONTENT-TYPE: #{metadata.content_type}"
+#   puts pretty_body
+
+#   # Propagate data if needed
+#   propagate rule[:relay], pretty_body
+# end
+
+def topic channel, name
+  @topics ||= {}
+  @topics[name] ||= channel.topic(name, durable: true, persistent: true)
+end
+
+def shout exchange, keys, body = {}
+  # Add timestamp
+  headers = {
+    sent_at: DateTime.now.iso8601,
+    sent_by: PROXY_IDENT
+    }
+  exchange_name = exchange.name
+
+  # Prepare key and data
+  routing_key = keys.unshift(exchange_name).join('.')
+  # payload = data
+
+  # Announce shout
+  header "SHOUT", ">", exchange_name, routing_key
+  puts JSON.pretty_generate(body) unless body.empty?
+
+  # Publish
+  exchange.publish(body.to_json,
+    routing_key: routing_key,
+    headers: headers,
+    app_id: "contributor",
+    content_type: "application/json",
+    )
+
+end
+
+
+# Init ASCII table
+config_table = Terminal::Table.new
+config_table.title = "Message propagation rules"
+config_table.headings = ["queue binding", "topic", "route", "relay", "title"]
+config_table.align_column(5, :right)
+
+
+# Bind every topic
+config[:rules].each do |rule_name, rule|
+  # Extract information
+  catch_subscribe = rule[:subscribe] || true
+  catch_topic = rule[:topic].to_s
+  catch_routes = rule[:routes].to_s.split(' ')
+
+  if catch_topic.empty? || catch_routes.empty?
+    abort "rule [#{rule_name}] is invalid: missing topic / routes"
+  end
+
+  # Build / attach to queue
+  rule_queue_name = "#{PROXY_IDENT}-#{QUEUE_HOST}-#{rule_name}"
+
+  begin
+    # Bind to this topic if not already done
+    listen_exchange = topic(channel, catch_topic)
+
+    # Pour this into a queue
+    queue = channel.queue(rule_queue_name, auto_delete: false, durable: true)
+
+    # Bind to these events on each route
+    catch_routes.each do |route|
+      # Bind with this routing key
+      queue.bind listen_exchange, routing_key: route
+      puts "BIND \t[#{rule_queue_name}] to [#{catch_topic}] / [#{route}] (subscribe: #{catch_subscribe})"
+
+      # Add row to table
+      config_table.add_row [rule_queue_name, catch_topic, route, rule[:relay].to_s, rule[:title].to_s ]
+    end
+
+  end
+
+
+  # Subscribe
+
+  queue.subscribe(block: false, manual_ack: SUB_USE_ACK, message_max: SUB_MSG_MAX) do |delivery_info, metadata, payload|
+
+    # Handle the message
+    handle_message rule_name, rule, delivery_info, metadata, payload
+
+    # Ack the msg
+    # puts "> #{delivery_info.delivery_tag}: nack"
+    # channel.nack(delivery_info.delivery_tag)
+
+    # if !SUB_USE_ACK
+    #   puts "> #{delivery_info.delivery_tag}: no ack"
+    # elsif (100*rand) <= ACK_PERCENT
+    #   channel.ack(delivery_info.delivery_tag)
+    #   puts "> #{delivery_info.delivery_tag}: ACKED"
+    # else
+    #   channel.nack(delivery_info.delivery_tag)
+    #   puts "> #{delivery_info.delivery_tag}: NOT_ACKED"
+    # end
+
+  end
+
+  # End of loop
+end
+
+
+# Display config and susbcribe to queue
+puts config_table
+
+
+
+puts
+puts "ENDED"

data/lib/pushyd/proxy.rb

@@ -4,9 +4,6 @@ require 'json'
 require 'terminal-table'
 
 module PushyDaemon
-
-  # class ProxyConnexionContext    < StandardError; end
-
   class Proxy < Endpoint
 
     attr_accessor :table
@@ -118,10 +115,8 @@ module PushyDaemon
           #   data = payload_extract(payload, fields)
           #   data_source = "extract #{fields.inspect} #{data.keys.count}k"
           return JSON.parse utf8payload
-
         when "text/plain"
           return utf8payload.to_s
-
         else
           return utf8payload
       end
@@ -133,6 +128,4 @@ module PushyDaemon
       end
 
     end
-
 end
-

data/lib/pushyd/shouter.rb

@@ -39,10 +39,6 @@ module PushyDaemon
       raise PushyDaemon::EndpointTopicContext unless @topic
       @exchange = @channel.topic(@topic, durable: true, persistent: true)
 
-      # if shout_config.is_a? Hash
-      #   shout_keys = shout_config[:keys] if config_shout[:keys].is_a? Array
-      # end
-
     rescue Bunny::TCPConnectionFailedForAllHosts => e
       error "ERROR: cannot connect to RabbitMQ hosts (#{e.inspect})"
     end
@@ -72,14 +68,14 @@ module PushyDaemon
   private
 
     def channel_shout keys, body = {}
-      # Add timestamp
+      # Prepare headers
       headers = {
         sent_at: DateTime.now.iso8601,
         sent_by: Conf.name
         }
-      exchange_name = @exchange.name
 
-      # Prepare key and data
+      # Prepare exchange_name and routing_key
+      exchange_name = @exchange.name
       routing_key = keys.unshift(exchange_name).join('.')
 
       # Announce shout
@@ -97,4 +93,3 @@ module PushyDaemon
 
   end
 end
-

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.2.3"
+  spec.version                      = "0.2.4"
 
   # Project description
   spec.name                         = "pushyd"
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency       "chamber"
   spec.add_runtime_dependency       "json"
   spec.add_runtime_dependency       "bunny"
-  spec.add_runtime_dependency       "rest_client"
+  spec.add_runtime_dependency       "rest-client"
   spec.add_runtime_dependency       "terminal-table"
   # spec.add_runtime_dependency "newrelic_rpm"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Bruno MEDICI
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest_client
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -183,6 +183,7 @@ files:
 - lib/pushyd/constants.rb
 - lib/pushyd/daemon.rb
 - lib/pushyd/endpoint.rb
+- lib/pushyd/proxy.orig.rb
 - lib/pushyd/proxy.rb
 - lib/pushyd/pushy_logger.rb
 - lib/pushyd/shouter.rb