pushyd 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa2f4f22cf8e3d98832400f34893f1128365332f
-  data.tar.gz: e8307c72a56774a3eb6f8b33d888a88fc1ffaeda
+  metadata.gz: 8eb02de265011f5fec1f4d59bc19ea7c74e04cf4
+  data.tar.gz: adeae96fac08c64d054849f8a5ecb740f42310e9
 SHA512:
-  metadata.gz: 82235ff0e466f37ae7bb1b200e0e49419e2be4116d84616cbf9473d60919640adbcc45855255aaf36c19a8ddc74c6a88e96a064d69ed307d25290a888c77ebc0
-  data.tar.gz: 3d43ed96eedd95cf24e3471cd4f5975e6a550559d4dd777334ba398c5c1b515dc38718a49f6524e508631c85322dcbad3f6ce421efd70744c8b72bbff5e19b2e
+  metadata.gz: 7233e7947eaaaf3111cbfea945a92b9cedcaa11baeb64b95646944ee148a96ed2c1ceba16e8f675721f4c584986493aff1f9d7a20a7fa8e127e0d8fab413ba38
+  data.tar.gz: 7b19b454c1e3afd721cbd78a99c4752ec70daec74413c558c31533de8677ce054c21a38cf314e597ad7819e3bc8aa1291fa542081191d023a62af017ffb98f06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushyd (0.8.2)
+    pushyd (0.9.0)
       api-auth
       bunny (~> 2.3)
       chamber (~> 2.9)

data/defaults.yml

@@ -1,5 +1,5 @@
 # common defaults
-amqp: amqp://guest:guest@localhost:5672/%2F
+broker: amqp://guest:guest@localhost:5672/%2F
 logs:
   path: '/tmp/'
   file: pushyd.log
@@ -9,14 +9,14 @@ logs:
 shout:
   topic: pushyd
   period: 10
-  # keys:
-  #   - tic
-  #   - tac
-  #   - toe
-  #   - created
-  #   - updated
-  #   - deleted
-  #   - crunched
+  keys:
+    - tic
+    - tac
+    - toe
+    - created
+    - updated
+    - deleted
+    - crunched
 
 # newrelic:
 #   licence: ""

data/lib/pushyd/constants.rb

@@ -7,6 +7,9 @@ WAY_PROP                = "PROP"
 PROXY_MESSAGE_MAX       = 1
 PROXY_USE_ACK           = false
 
+# Constants: shouter
+SHOUTER_SENTAT_DECIMALS = 6
+
 # Constants: logger
 LOG_ROTATION            = "daily"
 

data/lib/pushyd/endpoint.rb

@@ -74,7 +74,12 @@ module PushyDaemon
     # Start connexion to RabbitMQ
     def connect_channel busconf
       fail PushyDaemon::EndpointConnexionContext, "invalid bus host/port" unless busconf
-      info "connecting to #{busconf}"
+      info "connecting to bus", {
+        broker: busconf,
+        recover: AMQP_RECOVERY_INTERVAL,
+        heartbeat: AMQP_HEARTBEAT_INTERVAL,
+        prefetch: AMQP_PREFETCH
+        }
       conn = Bunny.new busconf.to_s,
         logger: @logger,
         # heartbeat: :server,
@@ -83,7 +88,6 @@ module PushyDaemon
         heartbeat_interval: AMQP_HEARTBEAT_INTERVAL
       conn.start
 
-
       # Create channel, prefetch only one message at a time
       channel = conn.create_channel
       channel.prefetch(AMQP_PREFETCH)
@@ -151,6 +155,17 @@ module PushyDaemon
       rand(36**len).to_s(36)
     end
 
+    def format_bytes number, unit="", decimals = 0
+      return "Ø" if number.nil? || number.to_f.zero?
+
+      units = ["", "k", "M", "G", "T", "P" ]
+      index = ( Math.log(number) / Math.log(2) ).to_i / 10
+      converted = number.to_f / (1024 ** index)
+
+      truncated = converted.round(decimals)
+      return "#{truncated} #{units[index]}#{unit}"
+    end
+
   private
 
   end

data/lib/pushyd/proxy.rb

@@ -20,7 +20,7 @@ module PushyDaemon
       @table.align_column(5, :right)
 
       # Start connexion to RabbitMQ and create channel
-      @channel = connect_channel Conf.amqp
+      @channel = connect_channel Conf[:broker]
       log_info "channel connected"
 
       # Check config
@@ -45,6 +45,19 @@ module PushyDaemon
 
   private
 
+    def extract_delay msg_headers
+      return unless msg_headers['sent_at']
+
+      # Extract sent_at header
+      sent_at = Time.iso8601(msg_headers['sent_at'])
+      # log_info "sent_at     : #{sent_at.to_f}"
+      # log_info "timenow     : #{Time.now.to_f}"
+
+      # Compute delay
+      return ((Time.now - sent_at)*1000).round(2)
+    end
+
+
     # Handle the reception of a message on a queue
     def handle_message rule, delivery_info, metadata, payload
       # Prepare data
@@ -53,14 +66,20 @@ module PushyDaemon
       msg_rkey = delivery_info.routing_key.force_encoding('UTF-8')
       msg_headers = metadata.headers || {}
 
-      # Extract fields
-      data = parse payload, metadata.content_type  #, rule
+      # Compute delay and size
+      delay = extract_delay(msg_headers)
+      size = format_bytes(payload.bytesize, "B")
+
+      # Extract payload
+      data = parse payload, metadata.content_type
 
       # Announce match
       log_message MSG_RECV, msg_exchange, msg_rkey, data, {
-        'rule' => rule_name,
+        'matched rule' => rule_name,
         'app-id' => metadata.app_id,
         'content-type' => metadata.content_type,
+        'delay (ms)' => delay,
+        'body size' => size,
         }
 
       # Build notification payload

data/lib/pushyd/shouter.rb

@@ -27,7 +27,7 @@ module PushyDaemon
       @period = config_shout[:period] || 0
 
       # Start connexion to RabbitMQ and create channel
-      @channel = connect_channel Conf.amqp
+      @channel = connect_channel Conf[:broker]
       log_info "channel connected"
 
       # Create exchange
@@ -44,9 +44,21 @@ module PushyDaemon
 
       # Prepare exchange
       loop do
+        # Generate key and fake id
+        if @keys.is_a?(Array) && @keys.any?
+          random_key = @keys.sample
+        else
+          random_key = "random"
+        end
+        # random_key = @keys.class
         random_string = SecureRandom.hex
-        random_key = @keys.sample || "random"
-        channel_shout [:ping, random_key, random_string], {dummy: true, time: Time.now.to_f, host: Conf.host}
+
+        # Generate payload
+        #payload = {time: Time.now.to_f, host: Conf.host}
+        payload = nil
+
+        # Shout it !
+        channel_shout [:ping, random_key, random_string], payload
         sleep @period
       end
     rescue AMQ::Protocol::EmptyResponseError => e
@@ -65,19 +77,20 @@ module PushyDaemon
   private
 
     def channel_shout keys, body = {}
-      # Prepare headers
-      headers = {
-        sent_at: DateTime.now.iso8601,
-        sent_by: Conf.app_name,
-        }
-
       # Prepare exchange_name and routing_key
       exchange_name = @exchange.name
-      routing_key = keys.unshift(exchange_name).join('.')
+      keys.unshift(exchange_name)
+      routing_key = keys.join('.')
 
       # Announce shout
       log_message MSG_SEND, exchange_name, routing_key, body
 
+      # Prepare headers
+      headers = {
+        sent_at: DateTime.now.iso8601(SHOUTER_SENTAT_DECIMALS),
+        sent_by: Conf.app_name,
+        }
+
       # Publish
       @exchange.publish(body.to_json,
         routing_key: routing_key,

data/pushyd.gemspec

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

metadata

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