You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/10/31 13:58:28 UTC
[3/3] git commit: Make DC compatible with webrick
Make DC compatible with webrick
Signed-off-by: Michal fojtik <mf...@redhat.com>
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/16b1c280
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/16b1c280
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/16b1c280
Branch: refs/heads/master
Commit: 16b1c280e701701b23668022048bb675e417ebc8
Parents: 66762e8
Author: Michal Fojtik <mf...@redhat.com>
Authored: Thu Oct 18 21:36:25 2012 +0200
Committer: Michal fojtik <mf...@redhat.com>
Committed: Wed Oct 31 13:57:54 2012 +0100
----------------------------------------------------------------------
server/lib/sinatra/rack_logger.rb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/16b1c280/server/lib/sinatra/rack_logger.rb
----------------------------------------------------------------------
diff --git a/server/lib/sinatra/rack_logger.rb b/server/lib/sinatra/rack_logger.rb
index 677444b..02bbf2a 100644
--- a/server/lib/sinatra/rack_logger.rb
+++ b/server/lib/sinatra/rack_logger.rb
@@ -89,7 +89,8 @@ module Rack
params = env['rack.request.form_hash'].nil? ? '' : ' '+env['rack.request.form_hash'].to_json
logger = @logger || env['rack.errors']
- logger << VERBOSE_FORMAT % [
+ logger_method = logger.respond_to?(:info) ? :info : :puts
+ logger.send logger_method, VERBOSE_FORMAT % [
env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
env["REMOTE_USER"] || "-",
now.strftime("%d/%b/%Y %H:%M:%S"),
@@ -110,7 +111,8 @@ module Rack
length = extract_content_length(header)
logger = @logger || env['rack.errors']
- logger << FORMAT % [
+ logger_method = logger.respond_to?(:info) ? :info : :puts
+ logger.send logger_method, FORMAT % [
env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
env["REMOTE_USER"] || "-",
now.strftime("%d/%b/%Y %H:%M:%S"),