pushyd 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c164022741e67725c4df7becef21483e55a6859
-  data.tar.gz: 613a5d94c098c12f4f39e023ddd163712a8581c3
+  metadata.gz: 8cb8408ab24d4a66d50b11e7c4f54e752759f9be
+  data.tar.gz: 23b2ee2ca006cd53c66f3dbb66d8b5b196450893
 SHA512:
-  metadata.gz: 228e4f772c5f5d6541e426d288b5e29b7f32382897d058511b229ffdb7e058325cd303e35eb62f88c0b94c3726c01b41683fc588047d61a841cb332f068ab541
-  data.tar.gz: a659b7425f0ff0a5859582ceb28a37156be0befe66d2e14f35e6b8d648209607ebd73832944b05840852a6a7cc320bed3adfece419fce586961db9ccd1e4e430
+  metadata.gz: c8788397bfe8f4d047d77c1f322d1dd1af05e0a8b15df9af83b08e123fb4d9d9324a7c1ab22a7e4667b29c50f06db3e5329632f14e4f96e797ade6ac28177271
+  data.tar.gz: 28d9b7d5d04dae4d987f8c5a623873e360d483bc4dc7897eecd7d49a4126c36f448c2b89b7b0b31a056688901af846029630d3e5956f261ddf8b431fe908e384

data/Gemfile.lock

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

data/lib/pushyd/conf.rb

@@ -113,7 +113,7 @@ protected
 
   def self.prepare_newrelic section, logfile
     # Disable NewRelic if no config present
-    unless section.is_a?(Hash)
+    unless section.is_a?(Hash) && section[:licence]
       ENV["NEWRELIC_AGENT_ENABLED"] = "false"
       return
     end

data/lib/pushyd/constants.rb

@@ -11,8 +11,7 @@ PROXY_USE_ACK           = false
 LOG_ROTATION            = "daily"
 LOG_TRIM_LINE           = 200
 LOG_FORMAT_TIME         = "%Y-%m-%d %H:%M:%S"
-LOG_FORMAT_HEADER       = "%s %d\t%-8s %-15s "
-
-LOG_FORMAT_ARRAY        = "     %s"
-LOG_FORMAT_HASH         = "     %-15s %s\n"
+LOG_FORMAT_HEADER       = "%s \t%d\t%-8s %-15s "
+LOG_FORMAT_ARRAY        = "%s     %s"
+LOG_FORMAT_HASH         = "%s     %-15s %s\n"
 

data/lib/pushyd/endpoint.rb

@@ -63,19 +63,17 @@ module PushyDaemon
       end
     end
 
+    def debug messages
+      @logger.debug messages
+    end
     def info message, lines = []
       @logger.info message
       debug_lines lines
     end
-
     def error messages
       @logger.error messages
     end
 
-    def debug messages
-      @logger.debug messages
-    end
-
     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)
@@ -127,7 +125,7 @@ module PushyDaemon
       rule_name = rule[:name].to_s
       rule_topic = rule[:topic].to_s
       rule_routes = rule[:routes].to_s.split(' ')
-      rule_queue = "#{Conf.name}-#{rule[:name]}"
+      rule_queue = "#{Conf.app_name}-#{rule[:name]}"
       fail PushyDaemon::EndpointSubscribeContext, "rule [#{rule_name}] lacking topic" unless rule_topic
       fail PushyDaemon::EndpointSubscribeContext, "rule [#{rule_name}] lacking routes" if rule_routes.empty?
 
@@ -168,11 +166,11 @@ module PushyDaemon
 
   private
 
-    def debug_lines lines
+    def debug_lines lines, prefix = ''
       if lines.is_a? Array
-        @logger.debug lines.map{ |line| sprintf(LOG_FORMAT_ARRAY, line) }
+        @logger.debug lines.map{ |line| sprintf(LOG_FORMAT_ARRAY, prefix, line) }
       elsif lines.is_a? Hash
-        @logger.debug lines.map{ |key, value| sprintf(LOG_FORMAT_HASH, key, value) }
+        @logger.debug lines.map{ |key, value| sprintf(LOG_FORMAT_HASH, prefix, key, value) }
       end
     end
 

data/lib/pushyd/shouter.rb

@@ -69,7 +69,7 @@ module PushyDaemon
       # Prepare headers
       headers = {
         sent_at: DateTime.now.iso8601,
-        sent_by: Conf.name,
+        sent_by: Conf.app_name,
         }
 
       # Prepare exchange_name and routing_key
@@ -83,7 +83,7 @@ module PushyDaemon
       @exchange.publish(body.to_json,
         routing_key: routing_key,
         headers: headers,
-        app_id: Conf.name,
+        app_id: Conf.app_name,
         content_type: "application/json",
         )
     end

data/pushyd.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler