summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-08 16:57:25 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-08 16:57:25 +0000
commit9f0ad87f9a5bf6281ae7632450f983d5bbd3f026 (patch)
tree50dd78ac9f8226c7d4fe9c587113903b75d9112a /lib
parentbbe58957be24d71e580bc07b21c364f7b0a14d1d (diff)
downloadruby-9f0ad87f9a5bf6281ae7632450f983d5bbd3f026.tar.gz
ruby-9f0ad87f9a5bf6281ae7632450f983d5bbd3f026.tar.xz
ruby-9f0ad87f9a5bf6281ae7632450f983d5bbd3f026.zip
* lib/webrick/httpserver.rb (HTTPServer#access_log): add "\n" to
the message. * lib/webrick/log.rb (BasicLog#log): add "\n" only if needed. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/webrick/httpserver.rb2
-rw-r--r--lib/webrick/log.rb5
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index f50e7d52d..cb5cd2af2 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -123,7 +123,7 @@ module WEBrick
def access_log(config, req, res)
param = AccessLog::setup_params(config, req, res)
@config[:AccessLog].each{|logger, fmt|
- logger << AccessLog::format(fmt, param)
+ logger << AccessLog::format(fmt+"\n", param)
}
end
diff --git a/lib/webrick/log.rb b/lib/webrick/log.rb
index 9331020ab..68db47abc 100644
--- a/lib/webrick/log.rb
+++ b/lib/webrick/log.rb
@@ -36,7 +36,10 @@ module WEBrick
def log(level, data)
if @log && level <= @level
- @log << (data + "\n")
+ if /\n\Z/ != data
+ @log << data
+ @log << "\n" if /\n\Z/ !~ data
+ end
end
end