pushyd 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2c2fdf04d821f7426534efaf27cf2d9b22f4dd9
-  data.tar.gz: 675fc154c60c0e485a998512514f56075442b7f0
+  metadata.gz: ba39e2325a7509e30286b4f11a82947c057cf292
+  data.tar.gz: da884f2520bc928813fe9f040d4f655ece0d0837
 SHA512:
-  metadata.gz: c6a95461c0fc1906ebcc622f8e8d07e3e78c0568d45ab05a472cbcaa87ec07efc9bae8ab4712459331fd904bac65c2e452368b6517277ce15e5399f1a7af58fd
-  data.tar.gz: d3b4448c9802b03b4913620ea3d2517dffdce669d7146c306322c05b99cda7162ab9ef6da4a23f3fb0b25f1a0a0636feff36ab34411b372fcd0ea716b2920476
+  metadata.gz: d1df640a0cf5b6a768f0af39d7e27f4ade48289f4a2ca3549e68744ebc3b05f7478d959d55b69aef56b7c8cda9fb80c3ef4b6d3bb796563c5d86150dc1027428
+  data.tar.gz: 01db0c676f7d2a5f6c7f4299a1f6a2551fdf65603b24b8c1f8e11daeb110e955b1c98cba91d1c8ac949cafa25810c85b5faea7ed33de6986bb462e1edd390739

data/.gitignore

@@ -7,3 +7,4 @@ log/
 DOC/
 .ruby-version
 local.yml
+/.idea

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    pushyd (0.20.1)
+    pushyd (0.21.0)
       api-auth
-      bmc-daemon-lib (~> 0.3.16)
+      bmc-daemon-lib (~> 0.4.3)
       bunny (~> 2.3)
       daemons
       json
@@ -19,8 +19,8 @@ GEM
     amq-protocol (2.0.1)
     api-auth (2.0.1)
     ast (2.3.0)
-    bmc-daemon-lib (0.3.16)
-      chamber (~> 2.9)
+    bmc-daemon-lib (0.4.3)
+      chamber (~> 2.9.1)
     bunny (2.5.1)
       amq-protocol (>= 2.0.1)
     chamber (2.9.1)
@@ -30,7 +30,7 @@ GEM
     diff-lcs (1.2.5)
     domain_name (0.5.20160826)
       unf (>= 0.0.5, < 1.0.0)
-    hashie (3.4.4)
+    hashie (3.4.6)
     http (2.0.3)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -45,16 +45,16 @@ GEM
     multi_json (1.12.1)
     netrc (0.11.0)
     newrelic_rpm (3.16.2.321)
-    parser (2.3.1.2)
+    parser (2.3.1.4)
       ast (~> 2.2)
     powerpack (0.1.1)
     rainbow (2.1.0)
-    rake (11.2.2)
+    rake (11.3.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rollbar (2.12.0)
+    rollbar (2.13.1)
       multi_json
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -69,14 +69,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.42.0)
+    rubocop (0.43.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    terminal-table (1.7.2)
+    terminal-table (1.7.3)
       unicode-display_width (~> 1.1.1)
     thor (0.19.1)
     unf (0.1.4)

data/bin/pushyd

@@ -75,10 +75,13 @@ monitor: false,
   }
 Daemons.run_proc(Conf.generate(:process_name), run_options) do
   # Load code
-  puts "--- load code"
+  Conf.prepare_newrelic
+
+  # Load code
+  Conf.log :launcher, "load project code"
   require_relative "../lib/pushyd"
 
   # Start daemon
-  puts "--- start daemon"
+  Conf.log :launcher, "start daemon"
   PushyDaemon::Daemon.run
 end

data/defaults.yml

@@ -7,8 +7,8 @@ logs:
   default:  "pushyd-default.log"
   shouter:  "pushyd-shouter.log"
   consumer: "pushyd-consumer.log"
-  # newrelic: "pushyd-newrelic.log"
-  # rollbar:  "pushyd-rollbar.log"
+  newrelic: "pushyd-newrelic.log"
+  rollbar:  "pushyd-rollbar.log"
 
 shout:
   topic: pushyd
@@ -22,11 +22,13 @@ shout:
     - deleted
     - crunched
 
-# newrelic:
-#   license: ""
-#   platform: "bigbusiness"               # app platform name
-#   app_name: "rftpd-bigbusiness-dev"     # nickname used for naming app
-#   logfile: null
+newrelic:
+  enabled: true
+  disabled: false
+
+rollbar:
+  enabled: true
+  disabled: false
 
 # rules:
 #   proxy_tests:

data/lib/pushyd/constants.rb

@@ -13,13 +13,16 @@ AMQP_MANUAL_ACK         = false
 SHOUTER_SENTAT_DECIMALS = 6
 
 # Constants: logger
-LOG_HEADER_TIME         = "%Y-%m-%d %H:%M:%S"
-LOG_HEADER_FORMAT       = "%s \t%d\t%-8s %-15s "
-LOG_MESSAGE_TRIM        = 500
-LOG_MESSAGE_TEXT        = "%s%s"
-LOG_MESSAGE_ARRAY       = "%s     %s"
-LOG_MESSAGE_HASH        = "%s     %-20s %s\n"
+LOGGER_FORMAT = {
+  context: {
+    caller: "%-17s",
+    rule:   "%-20s",
+    }
+  # array:    "PA%s     %s",
+  # hash:     "PH%s     %-20s %s",
+  }
+
 
 # Constants: logger app-specific prefix
 #LOG_PREFIX_FORMAT       = "(%-12s) (%-12s)"
-LOG_PREFIX_FORMAT       = "%-20s "
+

data/lib/pushyd/consumer.rb

@@ -19,7 +19,7 @@ module PushyDaemon
       @rule_name = rule_name
 
       # Prepare logger
-      @logger = BmcDaemonLib::LoggerPool.instance.get :consumer
+      log_pipe :consumer
 
       # Create channel, prefetch only one message at a time
       @channel = @conn.create_channel
@@ -31,8 +31,10 @@ module PushyDaemon
 
   protected
 
-    def log_prefix
-      [@rule_name]
+    def log_context
+      {
+        rule: @rule_name
+      }
     end
 
     # Handle the reception of a message on a queue

data/lib/pushyd/daemon.rb

@@ -10,7 +10,7 @@ module PushyDaemon
         sleep 1
       end
 
-    rescue EndpointConnectionError, ShouterInterrupted => e
+    rescue BmcDaemonLib::MqConsumerException, EndpointConnectionError, ShouterInterrupted => e
       abort "EXITING #{e.class}: #{e.message}"
     rescue Errno::EACCES, StandardError => e
       abort "EXITING #{e.class}: #{e.message} \n #{e.backtrace.to_yaml}"

data/lib/pushyd/initialize.rb

@@ -1,3 +1,2 @@
-# Init Rollbar and Newrelic
-Conf.prepare_newrelic
+# Init Rollbar
 Conf.prepare_rollbar

data/lib/pushyd/proxy.rb

@@ -46,9 +46,11 @@ module PushyDaemon
 
   protected
 
-    def log_prefix
-      [nil]
-      # [self.class.name.split('::').last, :proxy]
+    def log_context
+      {
+        me: :proxy
+      }
+
     end
 
     def create_shouter
@@ -66,12 +68,11 @@ module PushyDaemon
     def create_consumers
       # Get config
       config_rules = BmcDaemonLib::Conf[:rules]
-      log_info "create_consumers: #{config_rules.keys.join(', ')}"
-
       if config_rules.nil? || !config_rules.is_a?(Hash)
-        log_error "prepare: no rules"
+        log_error "create_consumers: no rules"
         return
       end
+      log_info "create_consumers: #{config_rules.keys.join(', ')}"
 
       # Subscribe for each and every rule/route
       config_rules.each do |name, rule|
@@ -109,5 +110,10 @@ module PushyDaemon
       @consumers << consumer
     end
 
+
+    def consumer_cancelled all={}
+      log_error "consumer_cancelled remotely: #{all.inspect}"
+    end
+
   end
 end

data/lib/pushyd/shouter.rb

@@ -20,7 +20,7 @@ module PushyDaemon
       @exchange = nil
 
       # Prepare logger
-      @logger = BmcDaemonLib::LoggerPool.instance.get :shouter
+      log_pipe :shouter
 
       # Check config
       unless config_shout && config_shout.any? && config_shout.is_a?(Enumerable)
@@ -68,9 +68,11 @@ module PushyDaemon
 
   protected
 
-    def log_prefix
-      [nil]
-      # [self.class.name.split('::').last, :shouter]
+    def log_context
+      {
+        me: :shouter
+      }
+
     end
 
   private

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.20.1"
+  spec.version                      = "0.21.0"
 
   # Project description
   spec.name                         = "pushyd"
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   # spec.add_development_dependency "pry"
 
   # Runtime dependencies
-  spec.add_runtime_dependency       "bmc-daemon-lib", "~> 0.3.16"
+  spec.add_runtime_dependency       "bmc-daemon-lib", "~> 0.4.3"
   spec.add_runtime_dependency       "daemons"
   spec.add_runtime_dependency       "json"
   spec.add_runtime_dependency       "bunny", "~> 2.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement