pushyd 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4d99244c44f7f99042eb496abe4831847dff1dc
-  data.tar.gz: 24c424c9b17278722785b0cabc84c3876df550ba
+  metadata.gz: 2c164022741e67725c4df7becef21483e55a6859
+  data.tar.gz: 613a5d94c098c12f4f39e023ddd163712a8581c3
 SHA512:
-  metadata.gz: 4600f69fc437189494e35dc3d762d0f3875cee5b50531864d67db2faefb54fe9087f934e2c8b757866fad562dd03be041c31d979705b81168fb115cf8e07bf68
-  data.tar.gz: eb7f68cbb2fc3ab2ecec2fbcd3cc6663d0879f60b8c421cc769e328d2ffc059e8b6e3a2f25aa5b14d6d5794dcc9999dec636f70566eb3fd7d8dde9af172bef0a
+  metadata.gz: 228e4f772c5f5d6541e426d288b5e29b7f32382897d058511b229ffdb7e058325cd303e35eb62f88c0b94c3726c01b41683fc588047d61a841cb332f068ab541
+  data.tar.gz: a659b7425f0ff0a5859582ceb28a37156be0befe66d2e14f35e6b8d648209607ebd73832944b05840852a6a7cc320bed3adfece419fce586961db9ccd1e4e430

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushyd (0.5.1)
+    pushyd (0.5.2)
       bunny (~> 2.3)
       chamber (~> 2.9)
       daemons

data/bin/pushyd

@@ -34,8 +34,8 @@ begin
   Conf.prepare config: cmd_config, logfile: cmd_logfile
 
   # Override log file
-  Conf[:log] ||= {}
-  Conf[:log][:file] = cmd_logfile.to_s if cmd_logfile
+  Conf[:logs] ||= {}
+  Conf[:logs][:file] = cmd_logfile.to_s if cmd_logfile
 
 rescue OptionParser::InvalidOption => e
   abort "EXITING: InvalidOption: #{e.message} \n #{e.backtrace.to_yaml}"

data/lib/pushyd/conf.rb

@@ -1,8 +1,6 @@
 require "chamber"
 
 # FIXME: files named with hyphens will not be found by Chamber for now
-# FIXME: reloading of configuration from API
-
 class ConfigMissingParameter    < StandardError; end
 class ConfigOtherError          < StandardError; end
 class ConfigParseError          < StandardError; end

data/lib/pushyd/constants.rb

@@ -1,7 +1,7 @@
 # Constants: global
-WAY_OUT   = "SENT"
-WAY_IN    = "RECD"
-WAY_POST  = "POST"
+MSG_SEND                = "SEND"
+MSG_RECV                = "RECV"
+WAY_PROP                = "PROP"
 
 # Constants: proxy
 PROXY_MESSAGE_MAX       = 1
@@ -11,10 +11,8 @@ PROXY_USE_ACK           = false
 LOG_ROTATION            = "daily"
 LOG_TRIM_LINE           = 200
 LOG_FORMAT_TIME         = "%Y-%m-%d %H:%M:%S"
-LOG_FORMAT_HEADER       = "%s\t%-8s\t%-30s"
-LOG_FORMAT_LINE         = LOG_FORMAT_HEADER+" %s\n"
-LOG_FORMAT_ARRAY        = LOG_FORMAT_HEADER+"    %s\n"
-LOG_FORMAT_HASH         = LOG_FORMAT_HEADER+"    %-17s %s\n"
-LOG_FORMAT_PROGNAME     = "%d\t%s"
+LOG_FORMAT_HEADER       = "%s %d\t%-8s %-15s "
 
+LOG_FORMAT_ARRAY        = "     %s"
+LOG_FORMAT_HASH         = "     %-15s %s\n"
 

data/lib/pushyd/endpoint.rb

@@ -41,7 +41,7 @@ module PushyDaemon
       @logger.formatter = Formatter
 
       # Set progname
-      @logger.progname = sprintf(LOG_FORMAT_PROGNAME, Process.pid, me.split('::').last)
+      @logger.progname = me.split('::').last
 
       # Set expected level
       @logger.level = case loglevel
@@ -63,36 +63,31 @@ module PushyDaemon
       end
     end
 
-    def error messages
-      @logger.error messages
+    def info message, lines = []
+      @logger.info message
+      debug_lines lines
     end
 
-    def info messages
-      @logger.info messages
+    def error messages
+      @logger.error messages
     end
 
     def debug messages
       @logger.debug messages
     end
 
-    def message params = {}
-      # Header
-      @logger.info sprintf(
-        "%3s %-15s %s",
-        params[:way],
-        params[:exchange],
-        params[:key]
-        )
-
-      # Attributes
-      @logger.debug params[:attrs] if params[:attrs].is_a?(Hash)
-
-      # Body (split in lines to log them separately)
-      if params[:body].is_a?(Enumerable) && !params[:body].empty?
-        body_json = JSON.pretty_generate(params[:body])
-        #puts "log? #{params[:body]} "
-        @logger.debug body_json.lines
+    def log_message msg_way, msg_exchange, msg_key, msg_body = [], msg_attrs = {}
+      # Message header
+      @logger.info sprintf("%3s %-15s %s", msg_way, msg_exchange, msg_key)
+
+      # Body lines
+      if msg_body.is_a?(Enumerable) && !msg_body.empty?
+        body_json = JSON.pretty_generate(msg_body)
+        debug_lines body_json.lines
       end
+
+      # Attributes lines
+      debug_lines msg_attrs
     end
 
     # Start connexion to RabbitMQ
@@ -171,5 +166,15 @@ module PushyDaemon
     def handle_message rule, delivery_info, metadata, payload
     end
 
+  private
+
+    def debug_lines lines
+      if lines.is_a? Array
+        @logger.debug lines.map{ |line| sprintf(LOG_FORMAT_ARRAY, line) }
+      elsif lines.is_a? Hash
+        @logger.debug lines.map{ |key, value| sprintf(LOG_FORMAT_HASH, key, value) }
+      end
+    end
+
   end
 end

data/lib/pushyd/formatter.rb

@@ -1,25 +1,24 @@
 module PushyDaemon
   class Formatter
 
-    def self.call severity, datetime, progname, messages
+    def self.call severity, datetime, progname, payload
       # Build common values
       timestamp = datetime.strftime(LOG_FORMAT_TIME)
 
-      # If we have a bunch of lines, prefix them and send them together
-      if messages.is_a? Array
-        messages.map do |line|
-          sprintf LOG_FORMAT_ARRAY, timestamp, severity, progname, trimmed(line)
-        end.join
-
-      elsif messages.is_a? Hash
-        messages.map do |key, value|
-          sprintf LOG_FORMAT_HASH, timestamp, severity, progname, key, value
-        end.join
+      # Build header
+      header = sprintf LOG_FORMAT_HEADER,
+        timestamp,
+        Process.pid,
+        severity,
+        progname
 
-      else
-        sprintf LOG_FORMAT_LINE, timestamp, severity, progname, trimmed(messages)
+      # If we have a bunch of lines, prefix them and send them together
+      return payload.map do |line|
+        "#{header}#{trimmed(line)}\n"
+      end.join if payload.is_a?(Array)
 
-      end
+      # Otherwise, just prefix the only line
+      return "#{header}#{trimmed(payload)}\n"
     end
 
   protected

data/lib/pushyd/proxy.rb

@@ -36,8 +36,7 @@ module PushyDaemon
       end
 
       # Send config table to logs
-      info "proxy initialized"
-      info @table.to_s.lines
+      info "proxy initialized", @table.to_s.lines
 
     rescue Bunny::TCPConnectionFailedForAllHosts => e
       error "ERROR: cannot connect to RabbitMQ hosts (#{e.inspect})"
@@ -58,14 +57,10 @@ module PushyDaemon
       data = parse payload, metadata.content_type  #, rule
 
       # Announce match
-      message way: WAY_IN,
-        exchange: msg_exchange,
-        key: msg_rkey,
-        body: data,
-        attrs: {
-          'rule' => rule_name,
-          'app-id' => metadata.app_id,
-          'content-type' => metadata.content_type,
+      log_message MSG_RECV, msg_exchange, msg_rkey, data, {
+        'rule' => rule_name,
+        'app-id' => metadata.app_id,
+        'content-type' => metadata.content_type,
         }
 
       # Build notification payload
@@ -87,10 +82,7 @@ module PushyDaemon
       id = SecureRandom.random_number(100)
 
       # Log message details
-      message way: WAY_POST,
-        exchange: id,
-        key: relay_url,
-        body: post_body
+      log_message WAY_PROP, id, relay_url, post_body
 
       # Push message to URL
       response = RestClient.post relay_url.to_s, JSON.pretty_generate(post_body), :content_type => :json

data/lib/pushyd/shouter.rb

@@ -36,8 +36,7 @@ module PushyDaemon
 
       # Send shouter info to logs
       shouter_info = { topic: @topic, period: @period, keys: @keys }
-      info "shouter initialized"
-      info shouter_info
+      info "shouter initialized", shouter_info
 
     rescue Bunny::TCPConnectionFailedForAllHosts => e
       error "ERROR: cannot connect to RabbitMQ hosts (#{e.inspect})"
@@ -50,7 +49,7 @@ module PushyDaemon
       loop do
         random_string = SecureRandom.hex
         random_key = @keys.sample || "random"
-        channel_shout [:ping, random_key, random_string], {}
+        channel_shout [:ping, random_key, random_string], {dummy: true, time: Time.now.to_f, host: Conf.host}
         sleep @period
       end
     rescue AMQ::Protocol::EmptyResponseError => e
@@ -78,11 +77,7 @@ module PushyDaemon
       routing_key = keys.unshift(exchange_name).join('.')
 
       # Announce shout
-      message way: WAY_OUT,
-        exchange: exchange_name,
-        key: routing_key,
-        body: body,
-        attrs: {}
+      log_message MSG_SEND, exchange_name, routing_key, body
 
       # Publish
       @exchange.publish(body.to_json,

data/pushyd.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Bruno MEDICI