huyegger 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3f517dd1fe0509a84de820331fb05e09ca43804
-  data.tar.gz: 85a02b0da52849d8f842b6e89dd1bf8628ae2047
+  metadata.gz: 8b8bd450e48cb0daa896999b9634abd56da369cd
+  data.tar.gz: 4e57c71f1cb6a65ebf762c7cde25d6b64eb069c3
 SHA512:
-  metadata.gz: 4c89fa43abedefb10c0250bb09a106cb174d027a9999cc4072496002a82647580c23904cdfffa07e4de17262aac1e88463c426332ea386c3d219d0a80c1ea944
-  data.tar.gz: d60edbc668718cce40af61582a83621c18918e6168aaad64fca1a8ed744949bfd5cd274d50d52372846445ca8f5b10b2968fec11ae411c39e50698319045f6ca
+  metadata.gz: 026347763efcb7c2a06b6c469dfed84b757c97def2ad30182d27e9b379fb0ca3b5375bb7ed9cee1902a43b3416db45aaf8bbf2c4f10ee1c4c49a41352e25f7a4
+  data.tar.gz: 2fc8dad76f40c84d4c8dbcca9d030b1b61e434b62207e390ca617884414df641c302e12815c9b870846a803542ae1574b22e9a06cceee6e3735323288f204f19

data/README.md

@@ -26,12 +26,12 @@ logger = Huyegger::Logger.new(syslog_logger)
 # Write messages:
 logger.info "log message"
 # => { "level": "INFO", "message": "test" }
-logger.info { "http.host" => '127.0.0.1', message: "log message" }
+logger.info { "http.host" => "127.0.0.1", message: "log message" }
 # => { "level": "INFO", "message": "test", "http.host": "127.0.0.1" }
 
 # Store context for all log messages, it will be merged to resulting messages
-logger.context("http.host" => '127.0.0.1')
-logger.info('test')
+logger.context("http.host" => "127.0.0.1")
+logger.info("test")
 # => { "level": "INFO", "message": "test", "http.host": "127.0.0.1" }
 
 # Remove context
@@ -44,6 +44,29 @@ Huyegger.json_encoder = proc { |obj, *opts| Oj.dump(obj, *opts) }
 # but you need to `require "json"` to use default json encoder.
 ```
 
+To use with Rails
+
+```ruby
+# inside config/enviroments/production.rb
+require "huyegger/railtie"
+
+# inside app/controller/application_controller.rb
+class ApplicationController < ActionController::Base
+  before_action :set_context
+
+  ...
+
+  def set_context
+    Rails.logger.context(
+      "http.host" => request.host,
+      "http.method" => request.request_method,
+      "http.path" => request.path,
+      "http.addr" => request.remote_ip
+    ) if Rails.logger.respond_to?(:context)
+  end
+end
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/mainameiz/huyegger.

data/huyegger.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'huyegger/version'
+require "huyegger/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "huyegger"
@@ -13,10 +13,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/mainameiz/huyegger"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the "allowed_push_host"
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."

data/lib/huyegger/formatter.rb

@@ -4,12 +4,12 @@ require "logger"
 module Huyegger
   class Formatter
     SEVERITY_STR = {
-      ::Logger::DEBUG => 'DEBUG',
-      ::Logger::INFO => 'INFO',
-      ::Logger::WARN => 'WARN',
-      ::Logger::ERROR => 'ERROR',
-      ::Logger::FATAL => 'FATAL',
-      ::Logger::UNKNOWN => 'UNKNOWN'
+      ::Logger::DEBUG => "DEBUG",
+      ::Logger::INFO => "INFO",
+      ::Logger::WARN => "WARN",
+      ::Logger::ERROR => "ERROR",
+      ::Logger::FATAL => "FATAL",
+      ::Logger::UNKNOWN => "UNKNOWN"
     }
 
     attr_reader :original_formatter
@@ -35,7 +35,7 @@ module Huyegger
       json_message.merge!(__context__)
       add_message!(json_message, msg)
 
-      Huyegger.json_encoder.call(json_message)
+      "#{Huyegger.json_encoder.call(json_message)}\n"
     end
 
     private
@@ -43,23 +43,23 @@ module Huyegger
     def add_severity!(json_message, severity)
       case severity
       when String
-        json_message.merge!('level' => severity)
+        json_message.merge!("level" => severity)
       when Integer
-        json_message.merge!('level' => SEVERITY_STR.fetch(severity))
+        json_message.merge!("level" => SEVERITY_STR.fetch(severity))
       else
-        json_message.merge!('level' => SEVERITY_STR.fetch(::Logger::UNKNOWN))
+        json_message.merge!("level" => SEVERITY_STR.fetch(::Logger::UNKNOWN))
       end
     end
 
     def add_message!(json_message, msg)
       case msg
       when String
-        json_message.merge!('message' => msg)
+        json_message.merge!("message" => msg)
       when Hash
-        json_message.merge!('message' => 'Empty message') # default message because it is required
+        json_message.merge!("message" => "Empty message") # default message because it is required
         json_message.merge!(msg)
       else
-        json_message.merge!('message' => msg.inspect)
+        json_message.merge!("message" => msg.inspect)
       end
     end
 

data/lib/huyegger/middleware.rb

@@ -0,0 +1,13 @@
+module Huyegger
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @app.call(env)
+    ensure
+      Rails.logger.purge_context! if Rails.logger.is_a?(Huyegger::Logger)
+    end
+  end
+end

data/lib/huyegger/railtie.rb

@@ -0,0 +1,21 @@
+module Huyegger
+  class Railtie < ::Rails::Railtie
+    initializer "huyegger.insert_middleware" do |app|
+      if ActionDispatch.const_defined? :RequestId
+        app.config.middleware.insert_after ActionDispatch::RequestId, Huyegger::Middleware
+      else
+        app.config.middleware.insert_after Rack::MethodOverride, Huyegger::Middleware
+      end
+
+      if ActiveSupport.const_defined?(:Reloader) && ActiveSupport::Reloader.respond_to?(:to_complete)
+        ActiveSupport::Reloader.to_complete do
+          Rails.logger.purge_context! if Rails.logger.is_a?(Huyegger::Logger)
+        end
+      elsif ActionDispatch.const_defined?(:Reloader) && ActionDispatch::Reloader.respond_to?(:to_cleanup)
+        ActionDispatch::Reloader.to_cleanup do
+          Rails.logger.purge_context! if Rails.logger.is_a?(Huyegger::Logger)
+        end
+      end
+    end
+  end
+end

data/lib/huyegger/version.rb

@@ -1,3 +1,3 @@
 module Huyegger
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huyegger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Nikolay Markov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,8 @@ files:
 - lib/huyegger.rb
 - lib/huyegger/formatter.rb
 - lib/huyegger/logger.rb
+- lib/huyegger/middleware.rb
+- lib/huyegger/railtie.rb
 - lib/huyegger/version.rb
 homepage: http://github.com/mainameiz/huyegger
 licenses: