pushyd 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bef5122c9c7a8a4276bc0e1f735c48b65b88f156
-  data.tar.gz: 8620fcd2277aafc9ff97c6c65ec4abe25a6f5339
+  metadata.gz: deac6c7be88fd0fe05c8afa55880aa29e6c4212d
+  data.tar.gz: 4f6a4226355bbee4a76bb489867f0b000d3455ed
 SHA512:
-  metadata.gz: dabd44f13d11e6167bb96b1e4c3d5c044bb0394ee386b3fe6ad84882339a518cf941d6f21aaab79090decd982511cbb1b1fe50ce5df124d70ee8d0487000a945
-  data.tar.gz: dc9779dfd1b20506840ccc799dbe5f8cac4d43daa30634ad4067a32a5a71b11b03dbdecdf4aa3a2075ba02195a6e40994da125cfb3208b8d234d4e2c6d765e38
+  metadata.gz: 646e19080f09c51c448189dbe5743a17a5be869670220ce740dd16d1f11ea49f060e8627ffe7ff8c83f61f21cc8d086ee3795bcdf0fce8594c2b639bc5006ffb
+  data.tar.gz: b707e637e0bd0e27acfd71f32c2b5db5caf146429fc1f3b9802facfe415242f0bc0222d6fb6d6a0f63ded5c9ba86b37736e9944fb2e63eb73df93a09a9c14b8f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushyd (0.2.4)
+    pushyd (0.3.0)
       bunny
       chamber
       daemons

data/bin/pushyd

@@ -39,8 +39,7 @@ begin
   puts "--- #{Conf.name} #{Conf.version}"
   puts "Environment    \t #{Conf.env}"
   puts "Config files   \t #{Conf.files}"
-  puts
-  puts "Log file       \t #{Conf[:log]}"
+  puts "Loging to file \t #{Conf[:log]}"
   puts Conf.dump if cmd_dump
 
 rescue OptionParser::InvalidOption => e
@@ -55,9 +54,6 @@ end
 # Run daemon
 run_options = {
   ontop: false,
-  # :dir_mode   => :normal,
-  # :dir        => File.join(root, 'amine.log'),
-  # :log_output => true,
   :backtrace  => true,
   :multiple   => false
   }
@@ -67,6 +63,6 @@ Daemons.run_proc('pushy-daemon', run_options) do
   require_relative "../lib/pushyd"
 
   # Start daemon
-  puts "--- starting"
+  puts "--- starting daemon"
   PushyDaemon::Daemon.run
 end

data/defaults.yml

@@ -5,9 +5,12 @@ bus:
   port: 5672
   user: guest
   pass: guest
-log: "pushyd.log"
+
+log: null
+
 shout:
   topic: pushyd
+  period: 2
   # keys:
   #   - tic
   #   - tac

data/lib/pushyd/conf.rb

@@ -1,7 +1,6 @@
 require "chamber"
 
 module PushyDaemon
-
   class ConfigMissingParameter    < StandardError; end
   class ConfigParseError          < StandardError; end
 

data/lib/pushyd/constants.rb

@@ -3,13 +3,11 @@ WAY_OUT   = "SENT"
 WAY_IN    = "RECD"
 WAY_POST  = "POST"
 
-
 # Constants: proxy
 PROXY_MESSAGE_MAX   = 1
 PROXY_USE_ACK       = false
 PROXY_SCOPE         = "dev"
 
-
 # Constants: logger
 LOG_COL_ID              = 6
 LOG_TRIM_LINE           = 200
@@ -18,4 +16,3 @@ LOG_FORMAT_MESSAGE      = "%-6s"
 LOG_NEWLINE             = "\n"
 LOG_INDENT              = "\t"
 LOG_ROTATION            = "daily"
-

data/lib/pushyd/daemon.rb

@@ -14,14 +14,8 @@ module PushyDaemon
       # Start infinite loop
       s.shout
 
-    rescue Errno::EACCES => e
-      #logger.error "ABORT #{e.class}: #{e.message}"
-      abort "ABORT #{e.class}: #{e.message}"
-
-    rescue Exception => e
-      #logger.error "ABORT #{e.class}: #{e.message}"
-      abort "ABORT #{e.class}: #{e.message}"
-
+    rescue Errno::EACCES, Exception => e
+      abort "EXITING #{e.class}: #{e.message}"
     end
 
   end

data/lib/pushyd/endpoint.rb

@@ -2,7 +2,6 @@ require 'bunny'
 require 'securerandom'
 
 module PushyDaemon
-
   class EndpointConnexionContext    < StandardError; end
   class EndpointConnectionError     < StandardError; end
   class EndpointSubscribeContext    < StandardError; end
@@ -17,17 +16,20 @@ module PushyDaemon
       # Create the logger
       @logger = PushyLogger.new(logfile, LOG_ROTATION)
       @logger.add Logger::INFO, "starting #{self.class.name.to_s}"
+
+      # Declare we're now logging
+      puts "#{self.class} logging to #{logfile}"
     end
 
   protected
 
-    def error message
-      @logger.add Logger::ERROR, "#{self.class}: #{message}"
+    def error message, lines = {}
+      @logger.add Logger::ERROR, "#{self.class}: #{message}", lines
       #raise "ABORT #{self.class}: #{message}"
     end
 
-    def info message
-      @logger.add Logger::INFO, "#{self.class}: #{message}"
+    def info message, lines = {}
+      @logger.add Logger::INFO, "#{self.class}: #{message}", lines
     end
 
     def message params = {}
@@ -52,8 +54,9 @@ module PushyDaemon
       end
 
       # Body (split in lines to log them separately)
-      unless (params[:body].nil? || params[:body].empty?)
-        JSON.pretty_generate(params[:body]).each_line do |line|
+      if params[:body] && params[:body].is_a?(Enumerable)
+        body_json = JSON.pretty_generate(params[:body])
+        body_json.each_line do |line|
           lines << line.rstrip
         end
       end
@@ -64,23 +67,27 @@ module PushyDaemon
     end
 
     # Start connexion to RabbitMQ
-    def connect busconf
+    def connect_channel busconf
       raise PushyDaemon::EndpointConnexionContext, "invalid bus host/port" unless (busconf.is_a? Hash) &&
         busconf[:host] && busconf[:port]
 
-      puts "connecting to #{busconf[:host]} port #{busconf[:port]}"
+      info "connecting to #{busconf[:host]} port #{busconf[:port]}"
       conn = Bunny.new host: (busconf[:host].to_s || "localhost").to_s,
         port: busconf[:port].to_i,
         user: busconf[:user].to_s,
         pass: busconf[:pass].to_s,
         heartbeat: :server
       conn.start
+
+      # Create channel
+      channel = conn.create_channel
+
     rescue Bunny::TCPConnectionFailedForAllHosts, Bunny::AuthenticationFailureError, AMQ::Protocol::EmptyResponseError  => e
       raise PushyDaemon::EndpointConnectionError, "error connecting (#{e.class})"
     rescue Exception => e
       raise PushyDaemon::EndpointConnectionError, "unknow (#{e.inspect})"
     else
-      return conn
+      return channel
     end
 
     # Declare or return the exchange for this topic

data/lib/pushyd/proxy.rb

@@ -20,9 +20,8 @@ module PushyDaemon
       @table.align_column(5, :right)
 
       # Start connexion to RabbitMQ and create channel
-      conn = connect Conf.bus
-      @channel = conn.create_channel
-      info "connected on a channel"
+      @channel = connect_channel Conf.bus
+      info "channel connected"
 
       # Check config
       config_rules = Conf[:rules]
@@ -39,7 +38,8 @@ module PushyDaemon
       end
 
       # Send config table to logs
-      info "dumping configuration\n#{@table.to_s}"
+      table_lines = @table.to_s.lines
+      info "initialized with configuration:", table_lines
 
     rescue Bunny::TCPConnectionFailedForAllHosts => e
       error "ERROR: cannot connect to RabbitMQ hosts (#{e.inspect})"
@@ -100,7 +100,6 @@ module PushyDaemon
 
       rescue Exception => e
         error "propagate: #{e.message}"
-
     end
 
 
@@ -121,11 +120,11 @@ module PushyDaemon
           return utf8payload
       end
 
-      # Handle body parse errors
-      rescue Encoding::UndefinedConversionError => e
-        error "parse: JSON PARSE ERROR: #{e.inspect}"
-        return {}
-      end
-
+    # Handle body parse errors
+    rescue Encoding::UndefinedConversionError => e
+      error "parse: JSON PARSE ERROR: #{e.inspect}"
+      return {}
     end
+
+  end
 end

data/lib/pushyd/pushy_logger.rb

@@ -25,12 +25,10 @@ class PushyLogger < Logger
   def add level, message, lines = {}
     level ||= Logger::DEBUG
 
-    prefix = "   | "
-
     if lines.is_a? Hash
-      output = build_from_hash prefix, lines
+      output = build_from_hash lines
     elsif lines.is_a? Array
-      output = build_from_array prefix, lines
+      output = build_from_array lines
     else
       output = []
     end
@@ -44,17 +42,19 @@ class PushyLogger < Logger
 
 protected
 
-  def build_from_array prefix, lines
+  def trim_line line
+    line.to_s.rstrip.strip[0..LOG_TRIM_LINE]
+  end
+
+  def build_from_array lines
     lines.map do |value|
-      text = value.to_s[0..LOG_TRIM_LINE]
-      "#{prefix}#{text}"
+      "#{LOG_INDENT}#{trim_line(value)}"
     end
   end
 
-  def build_from_hash prefix, lines
+  def build_from_hash lines
     lines.map do |name, value|
-      text = value.to_s.strip[0..LOG_TRIM_LINE]
-      "#{prefix}#{name}: #{text}"
+      "#{LOG_INDENT}#{name}: #{trim_line(value)}"
     end
   end
 

data/lib/pushyd/shouter.rb

@@ -2,12 +2,11 @@ require 'yaml'
 require 'json'
 
 module PushyDaemon
-
-  class ShouterResponseError    < StandardError; end
-  class ShouterChannelClosed    < StandardError; end
-  class ShouterPreconditionFailed    < StandardError; end
-  class ShouterInterrupted      < StandardError; end
-  class EndpointTopicContext    < StandardError; end
+  class ShouterResponseError       < StandardError; end
+  class ShouterChannelClosed       < StandardError; end
+  class ShouterPreconditionFailed  < StandardError; end
+  class ShouterInterrupted         < StandardError; end
+  class EndpointTopicContext       < StandardError; end
 
   class Shouter < Endpoint
 
@@ -19,25 +18,24 @@ module PushyDaemon
       @keys = []
 
       # Start connexion to RabbitMQ and create channel
-      conn = connect Conf.bus
-      @channel = conn.create_channel
-      info "connected on a channel"
+      @channel = connect_channel Conf.bus
+      info "channel connected"
 
       # Check config
       config_shout = Conf[:shout]
-      if (config_shout.is_a? Enumerable) && !config_shout.empty?
-        @keys = config_shout[:keys] if config_shout[:keys].is_a? Array
-        @topic = config_shout[:topic]
-
-        info "found topic: #{@topic}"
-        info "found keys: #{@keys.join(', ')}"
-      else
-        error "prepare: empty [shout] section"
+      if config_shout.empty? || (!config_shout.is_a? Enumerable)
+        abort "prepare: empty [shout] section"
       end
 
+      # Extract information
+      @keys = config_shout[:keys] if config_shout[:keys].is_a? Array
+      @topic = config_shout[:topic]
+      @period = config_shout[:period] || 0
+
       # Create exchange
       raise PushyDaemon::EndpointTopicContext unless @topic
       @exchange = @channel.topic(@topic, durable: true, persistent: true)
+      info "initialized with parameters:", {topic: @topic, period: @period, keys: @keys}
 
     rescue Bunny::TCPConnectionFailedForAllHosts => e
       error "ERROR: cannot connect to RabbitMQ hosts (#{e.inspect})"
@@ -51,7 +49,7 @@ module PushyDaemon
           random_key = @keys.sample || "random"
           channel_shout [:ping, random_key, random_string], {}
         end
-        sleep 1
+        sleep @period
       end
     rescue AMQ::Protocol::EmptyResponseError => e
       raise PushyDaemon::ShouterResponseError, "#{e.class} (#{e.inspect})"
@@ -88,7 +86,6 @@ module PushyDaemon
         app_id: Conf.name,
         content_type: "application/json",
         )
-
     end
 
   end

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.2.4"
+  spec.version                      = "0.3.0"
 
   # Project description
   spec.name                         = "pushyd"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -183,7 +183,6 @@ 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

data/lib/pushyd/proxy.orig.rb

@@ -1,198 +0,0 @@
-#!/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"