loga 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ea55004c4f02786aa7326eddf736f2a3f47bdac
-  data.tar.gz: 79b1ef4aca4cd6ac9aadd3a501cfdc84dca7ca91
+  metadata.gz: cdc0f0a6e5b8ea5868e4b85c00638ed67d73fac4
+  data.tar.gz: 79969e8d9e8e2a06649e6ad7c5cb857cbce35f86
 SHA512:
-  metadata.gz: e9047a4c1a74ddba23a41216915412f5c24bae7e862a2a03b417432cd6619102d939b90217f30dcbf89afcfde06c553698b702f89465173d1bafced72a09f8ae
-  data.tar.gz: b9b82664a07fc4a4175301734a332bbf8110660d493fd0d5226f9042a908b65181aca610fe05628fc546fa59a92afa52b92ebdb1bec03b08aedcd919caea93a3
+  metadata.gz: 3ade6b8ec6ee1c29d66eb45cd2b04ff8d8334a266312fa3ac24268b575b90113ba56d24432aee50f25d41d6a22a1a9903014d518437cdd1c2ccaf9fcf03381aa
+  data.tar.gz: 3556ccbed13ad63dad04534a6b87a4b25b5ac75eb84ecba88e059df63aa2e2cf3749a2fb4e3e063fa57494311d2cc01fcb642498e2901099f3352c4151064085

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.2] - 2016-12-08
+### Fixed
+- `Loga::Rack::Logger` looks into `env['rack.exception']` for exceptions
+
 ## [2.1.1] - 2016-12-02
 ### Fixed
 - Encoding error when converting uploaded file to JSON
@@ -53,6 +57,7 @@ when using simple format. The formatter adds level, timestamp, pid and tags prep
 ### Changed
 - Silence ActionDispatch::DebugExceptions' logger
 
+[2.1.2]: https://github.com/FundingCircle/loga/compare/v2.1.1...v2.1.2
 [2.1.1]: https://github.com/FundingCircle/loga/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/FundingCircle/loga/compare/v2.0.0...v2.1.0
 [2.1.0.pre.1]: https://github.com/FundingCircle/loga/compare/v2.0.0...v2.1.0.pre.1

data/README.md

@@ -107,6 +107,8 @@ opposed to a `ActionDispatch::Request`.
 With Sinatra Loga needs to be configured manually:
 
 ```ruby
+# config.ru
+require 'sinatra/base'
 require 'loga'
 
 Loga.configure(
@@ -116,11 +118,19 @@ Loga.configure(
   tags: [:uuid],
 )
 
+class MyApp < Sinatra::Base
+  set :logging, false # suppress Sinatra request logger
+
+  get '/' do
+    Loga.logger.info('Everything is Awesome!')
+    'Hello World!'
+  end
+end
+
 use Loga::Rack::RequestId
 use Loga::Rack::Logger
 
-use MyApp
-run Sinatra::Application
+run MyApp
 ```
 
 You can now use `Loga.logger` or assign it to your existing logger.

data/lib/loga/rack/logger.rb

@@ -80,7 +80,8 @@ module Loga
       end
 
       def exception
-        env['loga.exception'] || env['action_dispatch.exception'] || env['sinatra.error']
+        env['loga.exception'] || env['action_dispatch.exception'] ||
+          env['sinatra.error'] || env['rack.exception']
       end
 
       def filter_exceptions

data/lib/loga/version.rb

@@ -1,3 +1,3 @@
 module Loga
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.1.2'.freeze
 end

data/spec/integration/sinatra_spec.rb

@@ -1,5 +1,26 @@
 require 'spec_helper'
 
+class MySinatraApp < Sinatra::Base
+  set :logging, :false
+
+  get '/ok' do
+    'Hello Sinatra'
+  end
+
+  get '/error' do
+    nil.name
+  end
+
+  post '/users' do
+    content_type :json
+    params.to_json
+  end
+
+  get '/new' do
+    redirect '/ok'
+  end
+end
+
 RSpec.describe 'Structured logging with Sinatra', timecop: true do
   let(:io) { StringIO.new }
   let(:format) {}
@@ -14,41 +35,17 @@ RSpec.describe 'Structured logging with Sinatra', timecop: true do
       tags: [:uuid, 'TEST_TAG'],
     )
   end
+
   let(:last_log_entry) do
     io.rewind
     JSON.parse(io.read)
   end
 
   let(:app) do
-    Class.new(Sinatra::Base) do
-      # Disable show_exceptions and rely on user defined exception handlers
-      # (e.i. the error blocks)
-      set :show_exceptions, false
-
+    Rack::Builder.new do
       use Loga::Rack::RequestId
       use Loga::Rack::Logger
-
-      error do
-        status 500
-        body 'Ooops'
-      end
-
-      get '/ok' do
-        'Hello Sinatra'
-      end
-
-      get '/error' do
-        nil.name
-      end
-
-      post '/users' do
-        content_type :json
-        params.to_json
-      end
-
-      get '/new' do
-        redirect '/ok'
-      end
+      run MySinatraApp
     end
   end
 

data/spec/unit/loga/rack/logger_spec.rb

@@ -96,6 +96,15 @@ describe Loga::Rack::Logger do
       include_examples 'logs the event', level: :info
     end
 
+    context 'when the exception is on rack.exception', focus: true do
+      let(:response_status)  { 500 }
+      let(:exception)        { StandardError }
+      let(:logged_exception) { exception }
+      let(:options)          { { 'rack.exception' => exception } }
+
+      include_examples 'logs the event', level: :error
+    end
+
     context 'when no exception is raised' do
       include_examples 'logs the event', level: :info
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loga
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Funding Circle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport