From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 5 Aug 2010 08:46:04 +0000 (+0000)
Subject: instaweb: add access+error logging for WEBrick
X-Git-Tag: v1.7.3-rc0~93^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9323e7f09d171739e8dbc9d60d77281caa06177;p=git.git

instaweb: add access+error logging for WEBrick

This allows WEBrick to support all the logging functionality
in a manner consistent with the other web servers.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-instaweb.sh b/git-instaweb.sh
index e69fb74fe..e6f6ecda1 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -216,9 +216,15 @@ EOF
 	cat >"$fqgitdir/gitweb/$httpd.rb" <<EOF
 #!/usr/bin/env ruby
 require 'webrick'
+require 'logger'
 options = {
   :Port => $port,
   :DocumentRoot => "$root",
+  :Logger => Logger.new('$fqgitdir/gitweb/error.log'),
+  :AccessLog => [
+    [ Logger.new('$fqgitdir/gitweb/access.log'),
+      WEBrick::AccessLog::COMBINED_LOG_FORMAT ]
+  ],
   :DirectoryIndex => ["gitweb.cgi"],
   :CGIInterpreter => "$wrapper",
   :StartCallback => lambda do