pushyd 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a39ea36bef0ba33327db24a6865749ea94ae141
-  data.tar.gz: ffc5697760f37b0f9ea92078ca9f635569dd0461
+  metadata.gz: 0f6680e8b9c8639d2230c50187affeda2816b658
+  data.tar.gz: c896cb6178136eb5293a8cf0922b06364bb82f27
 SHA512:
-  metadata.gz: 7030ba96dcaf5124298d35834dd9d463fedd294143afc1bdb4e720d62371129f1d76b633266373f971715e1c0d8d1ebaeec09c3ff5d6c497eec62cc746e77efd
-  data.tar.gz: 7c8c2ae298a9f486e718156b773326556fd83d7951489ceb31a45f35f652df7c47d477f37edf778d755719260d9d0a648e1b41e17df89c78cf2c386024f6c6a0
+  metadata.gz: 0d9a4132921a47b2f909bd915213c9bf48606769ba8bd0d854da8c6936fc982e9bb5fb6c9e072be7ad63a0a3fc4172e0eeffc1fbc65cff8e61ecc9f53716d673
+  data.tar.gz: 9ecfa2313ed02c2df6c8285b4da4b9adc5905ef10200aad5bb62ec30272fdb71a9b3808c59308de94178848a33e3fe4041897c0556fecbfa32310c56675a3805

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    pushyd (0.9.2)
+    pushyd (0.9.4)
       api-auth
+      bmc-daemon-lib (~> 0.2)
       bunny (~> 2.3)
-      chamber (~> 2.9)
       daemons
       json
       newrelic_rpm
@@ -18,7 +18,9 @@ GEM
     amq-protocol (2.0.1)
     api-auth (2.0.0)
     ast (2.3.0)
-    bunny (2.4.0)
+    bmc-daemon-lib (0.2.0)
+      chamber (~> 2.9)
+    bunny (2.5.0)
       amq-protocol (>= 2.0.1)
     chamber (2.9.0)
       hashie (~> 3.3)

data/bin/pushyd

@@ -3,13 +3,13 @@
 # Try to load external libs, helpers and constants
 begin
   require "rubygems"
+  require 'bmc-daemon-lib'
   require "optparse"
   require 'daemons'
-  require_relative "../lib/shared/conf"
 rescue LoadError => e
   raise "EXITING: some basic libs were not found (#{e.message})"
 end
-include Shared
+include BmcDaemonLib
 
 
 # Handle configuration

data/defaults.yml

@@ -19,7 +19,7 @@ shout:
     - crunched
 
 # newrelic:
-#   licence: ""
+#   license: ""
 #   platform: "bigbusiness"               # app platform name
 #   app_name: "rftpd-bigbusiness-dev"     # nickname used for naming app
 #   logfile: null

data/lib/pushyd/endpoint.rb

@@ -2,18 +2,19 @@ require 'bunny'
 require "securerandom"
 
 module PushyDaemon
+  # Class exceptions
   class EndpointConnexionContext    < StandardError; end
   class EndpointConnectionError     < StandardError; end
   class EndpointSubscribeContext    < StandardError; end
   class EndpointSubscribeError      < StandardError; end
 
   class Endpoint
-    include Shared::LoggerHelper
+    include BmcDaemonLib::LoggerHelper
     attr_reader :logger
 
     def initialize
       # Prepare logger
-      init_logger Conf[:logs]
+      @logger = BmcDaemonLib::LoggerPool.instance.get :file
 
       # Done
       log_info "endpoint initialized"
@@ -21,42 +22,6 @@ module PushyDaemon
 
   protected
 
-    def init_logger logconf
-      # Check structure conformity or set it to an empty hash
-      logconf = {} unless logconf.is_a? Hash
-      loglevel  = logconf[:level]
-      me        = self.class.name
-
-      # Compute logfile
-      logfile = logfile(logconf, :file)
-
-      # Prepare logger (may be NIL > won't output anything)
-      @logger = Logger.new(logfile, LOG_ROTATION)
-      @logger.formatter = Shared::LoggerFormatter
-
-      # Set progname
-      @logger.progname = me.split('::').last
-
-      # Set expected level
-      @logger.level = case loglevel
-      when "debug"
-        Logger::DEBUG
-      when "info"
-        Logger::INFO
-      when "warn"
-        Logger::WARN
-      else
-        Logger::INFO
-      end
-
-      # Announce on STDOUT we're now logging to file
-      if logfile
-        puts "#{self.class} logging loglevel [#{loglevel} > #{@logger.level}] to [#{logfile}]"
-      else
-        puts "#{self.class} logging disabled"
-      end
-    end
-
     def log_message msg_way, msg_exchange, msg_key, msg_body = [], msg_attrs = {}
       # Message header
       info sprintf("%3s %-15s %s", msg_way, msg_exchange, msg_key)

data/lib/pushyd/proxy.rb

@@ -5,7 +5,9 @@ require 'terminal-table'
 module PushyDaemon
   class Proxy < Endpoint
     include Shared::HmacSignature
+    include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
+    # Class options
     attr_accessor :table
 
     def initialize
@@ -166,12 +168,8 @@ module PushyDaemon
     end
 
     # NewRelic instrumentation
-    if Conf.newrelic_enabled?
-      include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-      add_transaction_tracer :handle_message, category: :task
-      add_transaction_tracer :propagate,      category: :task
-    end
+    add_transaction_tracer :handle_message, category: :task
+    add_transaction_tracer :propagate,      category: :task
 
   end
 end
-

data/lib/pushyd/shouter.rb

@@ -6,7 +6,9 @@ module PushyDaemon
   class EndpointTopicContext       < StandardError; end
 
   class Shouter < Endpoint
+    include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
+    # Class options
     attr_accessor :table
 
     def initialize
@@ -101,11 +103,8 @@ module PushyDaemon
     end
 
     # NewRelic instrumentation
-    if Conf.newrelic_enabled?
-      include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-      add_transaction_tracer :channel_shout,  category: :task
-      add_transaction_tracer :shout,          category: :task
-    end
+    add_transaction_tracer :channel_shout,  category: :task
+    add_transaction_tracer :shout,          category: :task
 
   end
 end

data/lib/pushyd.rb

@@ -1,17 +1,12 @@
 # Global libs
 require "rubygems"
+require 'bmc-daemon-lib'
 require "yaml"
 require "json"
-#require "thread"
-#require "singleton"
 require "newrelic_rpm"
 
-
 # Shared libs
-require_relative "shared/logger_formatter"
-require_relative "shared/logger_helper"
 require_relative "shared/hmac_signature"
-require_relative "shared/conf"
 
 # Project libs
 require_relative "pushyd/constants"

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.9.2"
+  spec.version                      = "0.9.4"
 
   # Project description
   spec.name                         = "pushyd"
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.files                        = `git ls-files -z`.split("\x0")
   spec.executables                  = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths                = ["lib"]
-  spec.required_ruby_version        = ">= 2.2.3"
+  spec.required_ruby_version        = ">= 2.2"
 
   # Development dependencies
   spec.add_development_dependency   "bundler", "~> 1.6"
@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   # spec.add_development_dependency "pry"
 
   # Runtime dependencies
+  spec.add_runtime_dependency       "bmc-daemon-lib", "~> 0.2"
   spec.add_runtime_dependency       "daemons"
-  spec.add_runtime_dependency       "chamber", "~> 2.9"
   spec.add_runtime_dependency       "json"
   spec.add_runtime_dependency       "bunny", "~> 2.3"
   spec.add_runtime_dependency       "rest-client", "~> 1.8"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: daemons
+  name: bmc-daemon-lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: chamber
+  name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -214,10 +214,7 @@ files:
 - lib/pushyd/endpoint.rb
 - lib/pushyd/proxy.rb
 - lib/pushyd/shouter.rb
-- lib/shared/conf.rb
 - lib/shared/hmac_signature.rb
-- lib/shared/logger_formatter.rb
-- lib/shared/logger_helper.rb
 - pushyd.gemspec
 homepage: http://github.com/bmedici/pushyd
 licenses:
@@ -231,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -239,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A nice proxy listenning to a RabbitMQ bus, repeating selected messages in

data/lib/shared/conf.rb

@@ -1,201 +0,0 @@
-# FIXME: files named with hyphens will not be found by Chamber for now
-require "chamber"
-
-module Shared
-  class ConfigMissingParameter    < StandardError; end
-  class ConfigOtherError          < StandardError; end
-  class ConfigParseError          < StandardError; end
-  class ConfigMultipleGemspec     < StandardError; end
-  class ConfigMissingGemspec      < StandardError; end
-
-  class Conf
-    extend Chamber
-    PIDFILE_DIR = "/tmp/"
-
-    class << self
-      attr_accessor :app_env
-      attr_reader   :app_root
-      attr_reader   :app_libs
-      attr_reader   :app_name
-      attr_reader   :app_ver
-      attr_reader   :app_started
-      attr_reader   :app_spec
-      attr_reader   :files
-      attr_reader   :host
-    end
-
-    def self.init app_root
-      # Permanent flags
-      @initialized  = true
-      @app_started  = Time.now
-
-      # Default values
-      @files        ||= []
-      @app_name     ||= "app_name"
-      @app_env      ||= "production"
-      @host         ||= `hostname`.to_s.chomp.split(".").first
-
-      # Store and clean app_root
-      @app_root = File.expand_path(app_root)
-
-      # Try to find any gemspec file
-      matches   = Dir["#{@app_root}/*.gemspec"]
-      fail ConfigMissingGemspec, "gemspec file not found: #{gemspec_path}" if matches.size < 1
-      fail ConfigMultipleGemspec, "gemspec file not found: #{gemspec_path}" if matches.size > 1
-
-      # Load Gemspec (just the only match)
-      @spec     = Gem::Specification::load(matches.first)
-      @app_name = @spec.name
-      @app_ver  = @spec.version
-      fail ConfigMissingParameter, "gemspec: missing name" unless @app_name
-      fail ConfigMissingParameter, "gemspec: missing version" unless @app_ver
-
-      # Now we know app_name, initalize app_libs
-      @app_libs = File.expand_path("lib/#{@app_name}/", @app_root)
-
-      # Add other config files
-      #add_default_config
-      add_config generate(:config_defaults)
-      add_config generate(:config_etc)
-
-      # Return something
-      return @app_name
-    end
-
-    def self.prepare args = {}
-      ensure_init
-
-      # Add extra config file and load them all
-      add_config args[:config]
-      reload!
-
-      # Set Rack env
-      ENV["RACK_ENV"] = @app_env.to_s
-
-      # Set up encodings
-      Encoding.default_internal = "utf-8"
-      Encoding.default_external = "utf-8"
-
-      # Init New Relic
-      newrelic_logfile = File.expand_path(Conf[:logs][:newrelic].to_s, Conf[:logs][:path].to_s)
-      prepare_newrelic self[:newrelic], newrelic_logfile
-
-      # Try to access any key to force parsing of the files
-      self[:dummy]
-
-    rescue Psych::SyntaxError => e
-      fail ConfigParseError, e.message
-    rescue StandardError => e
-      fail ConfigOtherError, "#{e.message} \n #{e.backtrace.to_yaml}"
-    end
-
-    # Reload files
-    def self.reload!
-      ensure_init
-      load_files
-    end
-
-    def self.dump
-      ensure_init
-      to_hash.to_yaml(indent: 4, useheader: true, useversion: false )
-    end
-
-    # Direct access to any depth
-    def self.at *path
-      ensure_init
-      path.reduce(Conf) { |m, key| m && m[key.to_s] }
-    end
-
-    def self.newrelic_enabled?
-      ensure_init
-      self[:newrelic] && self[:newrelic][:licence]
-    end
-
-    # Defaults generators
-    def self.generate what
-      ensure_init
-      return case what
-
-      when :user_agent
-        "#{@app_name}/#{@app_ver}" if @app_name && @app_ver
-
-      when :config_defaults
-        "#{@app_root}/defaults.yml" if @app_root
-
-      when :config_etc
-        "/etc/#{@app_name}.yml" if @app_name
-
-      when :process_name
-        parts = [@app_name, @app_env]
-        parts << self[:port] if self[:port]
-        parts.join('-')
-
-      when :pidfile
-        process_name = self.generate(:process_name)
-        File.expand_path "#{process_name}.pid", PIDFILE_DIR
-
-      when :config_message
-        config_defaults = self.generate(:config_defaults)
-        config_etc = self.generate(:config_etc)
-
-        "A default configuration is available (#{config_defaults}) and can be copied to the default location (#{config_etc}): \n sudo cp #{config_defaults} #{config_etc}"
-
-      end
-    end
-
-
-  protected
-
-    def self.load_files
-      load files: @files, namespaces: { environment: @app_env }
-    end
-
-    def self.add_config path
-      @files << File.expand_path(path) if path && File.readable?(path)
-    end
-
-    def self.prepare_newrelic section, logfile
-      # Disable NewRelic if no config present
-      unless self.newrelic_enabled?
-        ENV["NEWRELIC_AGENT_ENABLED"] = "false"
-        return
-      end
-
-      # Enable GC profiler
-      GC::Profiler.enable
-
-      # Enable module
-      ENV["NEWRELIC_AGENT_ENABLED"] = "true"
-      ENV["NEW_RELIC_MONITOR_MODE"] = "true"
-
-      # License
-      ENV["NEW_RELIC_LICENSE_KEY"] = section[:licence].to_s
-
-      # Build NewRelic app_name if not provided as-is
-      if section[:app_name]
-        ENV["NEW_RELIC_APP_NAME"] = section[:app_name].to_s
-      else
-        stack = []
-        stack << (section[:prefix] || @app_name)
-        stack << section[:platform] if section[:platform]
-        stack << @app_env
-        text = stack.join('-')
-        ENV["NEW_RELIC_APP_NAME"] = "#{text}-#{host};#{text}"
-      end
-
-      # Logfile
-      ENV["NEW_RELIC_LOG"] = logfile.to_s if logfile
-    end
-
-  private
-
-    def self.ensure_init
-      # Skip is already done
-      return if @initialized
-
-      # Go through init if not already done
-      self.init
-    end
-
-  end
-end

data/lib/shared/logger_formatter.rb

@@ -1,31 +0,0 @@
-module Shared
-  class LoggerFormatter
-
-    def self.call severity, datetime, progname, payload
-      # Build common values
-      timestamp = datetime.strftime(LOG_HEADER_TIME)
-
-      # Build header
-      header = sprintf LOG_HEADER_FORMAT,
-        timestamp,
-        Process.pid,
-        severity,
-        progname
-
-      # 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)
-
-      # Otherwise, just prefix the only line
-      return "#{header}#{trimmed(payload)}\n"
-    end
-
-  protected
-
-    def self.trimmed line
-      line.to_s.rstrip[0..LOG_MESSAGE_TRIM].force_encoding(Encoding::UTF_8)
-    end
-
-  end
-end

data/lib/shared/logger_helper.rb

@@ -1,93 +0,0 @@
-require "logger"
-
-module Shared
-  module LoggerHelper
-    CONFIG_PATH = :path
-
-    def logfile config, pipe
-      # Disabled if no valid config
-      return nil unless config.is_a?(Hash)
-
-      # Compute logfile and check if we can write there
-      logfile = File.expand_path(config[pipe].to_s, config[CONFIG_PATH].to_s)
-
-      # Check that we'll be able to create logfiles
-      if File.exists?(logfile)
-        # File is there, is it writable ?
-        unless File.writable?(logfile)
-          puts "LoggerHelper [#{pipe}] disabled: file not writable [#{logfile}]"
-          return nil
-        end
-      else
-        # No file here, can we create it ?
-        logdir = File.dirname(logfile)
-        unless File.writable?(logdir)
-          puts "LoggerHelper [#{pipe}] disabled: directory not writable [#{logdir}]"
-          return nil
-        end
-      end
-
-      # OK, return a clean file path
-      puts "LoggerHelper [#{pipe}] logging to [#{logfile}]"
-      return logfile
-    end
-
-  protected
-
-    def log_info message, details = nil
-      build_messages Logger::INFO, message, details
-    end
-
-    def log_error message, details = nil
-      build_messages Logger::ERROR, message, details
-    end
-
-    def log_debug message, details = nil
-      build_messages Logger::DEBUG, message, details
-    end
-
-    alias info log_info
-    alias error log_error
-    alias debug log_debug
-
-  private
-
-    # Builds prefix if LOG_PREFIX_FORMAT defined and caller has log_prefix method to provide values
-    def build_prefix
-      # Skip if no values from user class
-      return unless respond_to?(:log_prefix, true)
-      values = log_prefix
-
-      # Skip if no format defined
-      return unless defined?('LOG_PREFIX_FORMAT')
-      return unless LOG_PREFIX_FORMAT.is_a? String
-
-      # Build prefix string
-      LOG_PREFIX_FORMAT % values.map(&:to_s)
-    end
-
-    def build_messages severity, message, details = nil
-      messages = []
-
-      prefix = build_prefix
-
-      # Add main message
-      messages << sprintf(LOG_MESSAGE_TEXT, prefix, message) if message
-
-      # Add details from array
-      details.each do |line|
-        messages << sprintf(LOG_MESSAGE_ARRAY, prefix, line)
-      end if details.is_a? Array
-
-      # Add details from hash
-      details.each do |key, value|
-        messages << sprintf(LOG_MESSAGE_HASH, prefix, key, value)
-      end if details.is_a? Hash
-
-      # Return all that stuff
-      # messages << "\\---------------------------------------"
-      logger.add severity, messages
-    end
-
-  end
-end