Merge pull request #468 from tdiary/server-logging-option

tdiary serverコマンドにlogオプションを追加

Gemfile

@@ -11,16 +11,6 @@ group :coffee do
   gem 'therubyracer'
 end
 
-group :server do
-  platforms :mri do
-    gem 'thin'
-  end
-
-  platforms :jruby do
-    gem 'trinidad'
-  end
-end
-
 group :development do
   gem 'pit', require: false
   gem 'racksh', require: false

Gemfile.lock

@@ -26,11 +26,9 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor (= 1.2.2)
       thor (= 0.18.1)
-    daemons (1.1.9)
     debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    eventmachine (1.0.4)
     execjs (2.2.2)
     fastimage (1.6.6)
       addressable (~> 2.3, >= 2.3.5)
@@ -112,10 +110,6 @@ GEM
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.6.3)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
     thor (0.18.1)
     tilt (1.4.1)
     tins (0.13.2)
@@ -149,5 +143,3 @@ DEPENDENCIES
   sqlite3
   test-unit
   therubyracer
-  thin
-  trinidad

lib/tdiary/cli.rb

@@ -96,7 +96,10 @@ def test
 			"bind to the IP"
 		method_option "port", aliases: "p", type: :numeric, default: 19292, banner:
 			"use PORT"
+		method_option "log", aliases: "l", type: :string, banner:
+			"File to redirect output"
 		def server
+			require 'tdiary'
 			require 'tdiary/environment'
 
 			if options[:cgi]
@@ -105,22 +108,25 @@ def server
 					:bind   => options[:bind],
 					:port   => options[:port],
 					:logger => $stderr,
-					:access_log => $stderr,
+					:access_log => options[:log] ? File.open(options[:log], 'a') : $stderr
 				}
 				TDiary::Server.run( opts )
 			elsif
 				# --rack option
 				# Rack::Server reads ARGV as :config, so delete it
+				require 'webrick'
 				ARGV.shift
 				opts = {
 					:environment => ENV['RACK_ENV'] || "development",
 					:daemonize   => false,
 					:Host        => options[:bind],
 					:Port        => options[:port],
 					:pid         => File.expand_path("tdiary.pid"),
-					:AccessLog   => $stderr,
 					:config      => File.expand_path("config.ru")
 				}
+				if options[:log]
+					opts[:AccessLog] = [[File.open(options[:log], 'a'), WEBrick::AccessLog::CLF]]
+				end
 				::Rack::Server.start( opts )
 			end
 		end

lib/tdiary/tasks/release.rake

@@ -34,7 +34,7 @@ def make_tarball( repo, version = nil )
 			sh "chmod +x index.rb index.fcgi update.rb update.fcgi"
 			sh 'rake doc'
 			Bundler.with_clean_env do
-					sh "bundle --path .bundle --without coffee:server:development:test"
+					sh "bundle --path .bundle --without coffee:development:test"
 			end
 
 			# reduce filesize