Return @app_response as returned by @app.call
This commit is contained in:
parent
7ba0dba6fa
commit
c0327a4b8d
|
@ -21,11 +21,6 @@ class Grape::Middleware::Logger < Grape::Middleware::Globals
|
|||
error = catch(:error) do
|
||||
begin
|
||||
@app_response = @app.call(@env)
|
||||
# Usually a rack response object is returned: https://github.com/ruby-grape/grape/blob/master/UPGRADING.md#changes-in-middleware
|
||||
# However, rack/auth/abstract/handler.rb still returns an array instead of a rack response object.
|
||||
if @app_response.is_a?(Array)
|
||||
@app_response = Rack::Response.new(@app_response[2], @app_response[0], @app_response[1])
|
||||
end
|
||||
rescue => e
|
||||
after_exception(e)
|
||||
raise e
|
||||
|
@ -36,7 +31,13 @@ class Grape::Middleware::Logger < Grape::Middleware::Globals
|
|||
after_failure(error)
|
||||
throw(:error, error)
|
||||
else
|
||||
after(@app_response.status)
|
||||
# Usually a rack response object is returned: https://github.com/ruby-grape/grape/blob/master/UPGRADING.md#changes-in-middleware
|
||||
# However, rack/auth/abstract/handler.rb still returns an array instead of a rack response object.
|
||||
if @app_response.is_a?(Array)
|
||||
after(@app_response[0])
|
||||
else
|
||||
after(@app_response.status)
|
||||
end
|
||||
end
|
||||
@app_response
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue