pushyd 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 838aaf0ca927c20acf4d53714ff5eaa11499716a
-  data.tar.gz: e481c674723737cf9b8b6f84b38e57c8e6b39804
+  metadata.gz: c969ee7254c157dc251ed7e2a8608d35ddef72de
+  data.tar.gz: 746e6b66dcbbecf7c46c11aa89a4e552708d820a
 SHA512:
-  metadata.gz: e7cad3480998b54851e30573b0e1f8229c9c2ccd50359436b11b236ccccbd6fc2817e7a7bcecbcedbff0538366efa5814c61aeefccedc3d1d2408c2e07104fcb
-  data.tar.gz: 37cc4b0233a4da19f28d3c2a52cce679e4e12129b282bdb3d514ceee0a1ee5dac3a40b051bb5f783f20aee425eab2a0fa4b06003234030ad037e16dec4fe9813
+  metadata.gz: ab2bb5a1eb46ae1b30b29c76c031331dec347bb54ee028d9d27ffa7d0abe4007baa6ff3e3861f4ef4e6c2fdb05aa287c26292739c6331808d5e22bfb5dfc455e
+  data.tar.gz: 0b5b868b6315988e49b41b0e52c7fb593d0d7716c396f1aa65edd72920124bc4fb41f7207c4332f03f084a1dc798d578f0f057fe969e0d70f55674a39ea2998d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushyd (0.1.1)
+    pushyd (0.2.0)
       bunny
       chamber
       daemons

data/bin/{pushyd.rb → pushyd}

@@ -64,13 +64,7 @@ Daemons.run_proc('pushy-daemon', run_options) do
   puts "--- loading code and logger"
   require_relative "../lib/pushyd"
 
-  # Prepare logger
-  if Config[:log]
-    logger = Logger.new(Config[:log])
-    logger.info('Daemon starting')
-  end
-
   # Start daemon
   puts "--- starting"
-  PushyDaemon::Daemon.run(logger)
+  PushyDaemon::Daemon.run
 end

data/lib/pushyd/constants.rb

@@ -10,4 +10,14 @@ PROXY_USE_ACK       = false
 PROXY_SCOPE         = "dev"
 
 
+# Constants: logger
+LOG_COL_ID              = 6
+LOG_TRIM_LINE           = 200
+LOG_FORMAT_TIME         = "%Y-%m-%d %H:%M:%S"
+LOG_FORMAT_MESSAGE      = "%-6s"
+LOG_NEWLINE             = "\n"
+LOG_INDENT              = "\t"
+LOG_ROTATION            = "daily"
+
+
 # Constants: shouter

data/lib/pushyd/daemon.rb

@@ -1,18 +1,27 @@
 module PushyDaemon
   class Daemon
 
-    def self.run(logger)
+    def self.run
       # Create a new proxy
-      p = Proxy.new(logger)
+      p = Proxy.new
 
       # Dump config table
       puts p.table.to_s
 
       # Create a new shouter
-      s = Shouter.new(logger)
+      s = Shouter.new
 
       # Start infinite loop
       s.shout
+
+    rescue Errno::EACCES => e
+      #logger.error "ABORT #{e.class}: #{e.message}"
+      abort "ABORT #{e.class}: #{e.message}"
+
+    rescue Exception => e
+      #logger.error "ABORT #{e.class}: #{e.message}"
+      abort "ABORT #{e.class}: #{e.message}"
+
     end
 
   end

data/lib/pushyd/endpoint.rb

@@ -10,27 +10,33 @@ module PushyDaemon
 
   class Endpoint
 
-    def initialize(logger)
-      @logger = logger
+    def initialize
+      # Prepare logger (may be NIL > won't output anything)
+      logfile = Config[:log]
+
+      # Create the logger
+      @logger = PushyLogger.new(logfile, LOG_ROTATION)
+      @logger.add Logger::INFO, "starting #{self.class.name.to_s}"
     end
 
   protected
 
-    def abort message
-      @logger.error "ABORT #{self.class}: #{message}"
-      raise "ABORT #{self.class}: #{message}"
+    def error message
+      @logger.add Logger::ERROR, "#{self.class}: #{message}"
+      #raise "ABORT #{self.class}: #{message}"
     end
 
     def info message
-      @logger.info "#{self.class}: #{message}"
+      @logger.add Logger::INFO, "#{self.class}: #{message}"
     end
 
     def message params = {}
       # Indenting
-      indent = " " * (params[:way].length)
+      #indent = " " * (params[:way].length)
+      lines = []
 
       # Header
-      @logger.info sprintf(
+      message = sprintf(
         "%3s %-15s %s",
         params[:way],
         params[:exchange],
@@ -39,17 +45,22 @@ module PushyDaemon
 
       # Attributes
       if (params[:attrs].is_a? Hash)
+        # lines.merge params[:attrs]
         params[:attrs].each do |name, value|
-          @logger.info sprintf("%s %-15s %s", indent, name, value)
+          lines << sprintf("%-15s %s", name, value)
         end
       end
 
       # Body (split in lines to log them separately)
       unless (params[:body].nil? || params[:body].empty?)
         JSON.pretty_generate(params[:body]).each_line do |line|
-          @logger.info sprintf("%s %s", indent, line.rstrip)
+          lines << line.rstrip
         end
       end
+
+      # Send the info
+      @logger.add Logger::INFO, message, lines
+      # @logger.log_info message, lines
     end
 
     # Start connexion to RabbitMQ

data/lib/pushyd/proxy.rb

@@ -11,10 +11,10 @@ module PushyDaemon
 
     attr_accessor :table
 
-    def initialize(logger)
+    def initialize
       # Init
+      super
       @exchanges = {}
-      @logger = logger
 
       # Init ASCII table
       @table = Terminal::Table.new
@@ -30,7 +30,7 @@ module PushyDaemon
       # Check config
       config_rules = Config[:rules]
       unless (config_rules.is_a? Enumerable) && !config_rules.empty?
-        abort "prepare: empty [rules] section"
+        error "prepare: empty [rules] section"
       end
       info "found rules: #{config_rules.keys.join(', ')}"
 
@@ -45,7 +45,7 @@ module PushyDaemon
       info "dumping configuration\n#{@table.to_s}"
 
     rescue Bunny::TCPConnectionFailedForAllHosts => e
-      abort "ERROR: cannot connect to RabbitMQ hosts (#{e.inspect})"
+      error "ERROR: cannot connect to RabbitMQ hosts (#{e.inspect})"
     end
 
   private
@@ -102,7 +102,7 @@ module PushyDaemon
       info "#{id}: #{response.body}"
 
       rescue Exception => e
-        abort "propagate: #{e.message}"
+        error "propagate: #{e.message}"
 
     end
 
@@ -128,7 +128,7 @@ module PushyDaemon
 
       # Handle body parse errors
       rescue Encoding::UndefinedConversionError => e
-        abort "parse: JSON PARSE ERROR: #{e.inspect}"
+        error "parse: JSON PARSE ERROR: #{e.inspect}"
         return {}
       end
 

data/lib/pushyd/pushy_logger.rb

@@ -0,0 +1,61 @@
+require "logger"
+
+class PushyLogger < Logger
+
+  def initialize logfile, rotation = nil
+    # Call my parent's initializer
+    super
+
+    # And the formatter
+    self.formatter = proc do |severity, datetime, progname, messages|
+      # Build common line prefix
+      prefix = "%s %s\t" % [
+        datetime.strftime(LOG_FORMAT_TIME),
+        severity      ]
+
+      # If we have a bunch of lines, prefix them and send them together
+      if messages.is_a? Array
+        messages.map { |line| prefix + line + LOG_NEWLINE}.join
+      else
+        prefix + messages.to_s + LOG_NEWLINE
+      end
+    end
+  end
+
+  def add level, message, lines = {}
+    level ||= Logger::DEBUG
+
+    prefix = "   | "
+
+    if lines.is_a? Hash
+      output = build_from_hash prefix, lines
+    elsif lines.is_a? Array
+      output = build_from_array prefix, lines
+    else
+      output = []
+    end
+
+    # Prepend plain message to output
+    output.unshift message.force_encoding(Encoding::UTF_8)
+
+    # Send all this to logger
+    super level, output
+  end
+
+protected
+
+  def build_from_array prefix, lines
+    lines.map do |value|
+      text = value.to_s[0..LOG_TRIM_LINE]
+      "#{prefix}#{text}"
+    end
+  end
+
+  def build_from_hash prefix, lines
+    lines.map do |name, value|
+      text = value.to_s.strip[0..LOG_TRIM_LINE]
+      "#{prefix}#{name}: #{text}"
+    end
+  end
+
+end

data/lib/pushyd/shouter.rb

@@ -13,9 +13,9 @@ module PushyDaemon
 
     attr_accessor :table
 
-    def initialize(logger)
+    def initialize
       # Init
-      @logger = logger
+      super
       @keys = []
 
       # Start connexion to RabbitMQ and create channel
@@ -32,7 +32,7 @@ module PushyDaemon
         info "found topic: #{@topic}"
         info "found keys: #{@keys.join(', ')}"
       else
-        abort "prepare: empty [shout] section"
+        error "prepare: empty [shout] section"
       end
 
       # Create exchange
@@ -44,7 +44,7 @@ module PushyDaemon
       # end
 
     rescue Bunny::TCPConnectionFailedForAllHosts => e
-      abort "ERROR: cannot connect to RabbitMQ hosts (#{e.inspect})"
+      error "ERROR: cannot connect to RabbitMQ hosts (#{e.inspect})"
     end
 
     def shout
@@ -66,7 +66,6 @@ module PushyDaemon
 
     rescue Interrupt => e
       @channel.close
-      # conn.close
       raise PushyDaemon::ShouterInterrupted, "#{e.class} (#{e.inspect})"
     end
 

data/lib/pushyd.rb

@@ -8,6 +8,7 @@ require "singleton"
 # Project libs
 require_relative "pushyd/config"
 require_relative "pushyd/constants"
+require_relative "pushyd/pushy_logger"
 require_relative "pushyd/endpoint"
 require_relative "pushyd/proxy"
 require_relative "pushyd/shouter"

data/pushyd.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Bruno MEDICI
@@ -167,7 +167,7 @@ dependencies:
 description: "(description to be written)"
 email: pushyd@bmconseil.com
 executables:
-- pushyd.rb
+- pushyd
 extensions: []
 extra_rdoc_files: []
 files:
@@ -176,7 +176,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- bin/pushyd.rb
+- bin/pushyd
 - defaults.yml
 - lib/pushyd.rb
 - lib/pushyd/config.rb
@@ -184,6 +184,7 @@ files:
 - lib/pushyd/daemon.rb
 - lib/pushyd/endpoint.rb
 - lib/pushyd/proxy.rb
+- lib/pushyd/pushy_logger.rb
 - lib/pushyd/shouter.rb
 - pushyd.gemspec
 homepage: http://github.com/bmedici/pushyd