diff options
author | James Tucker <jftucker@gmail.com> | 2014-08-03 14:26:19 -0300 |
---|---|---|
committer | James Tucker <jftucker@gmail.com> | 2014-08-03 14:26:19 -0300 |
commit | 84f2946f9296f1e5da8ffd1c7eb96863731eaef1 (patch) | |
tree | 0f93510ca340c4b1b6a151a318cafbc25edd8836 | |
parent | e4fd87fc24a6bc10598afb83d5f572db96c241c2 (diff) | |
parent | 9f0aa9257141f0ee0b5acbbb8b30c751d2e5a377 (diff) | |
download | rack-84f2946f9296f1e5da8ffd1c7eb96863731eaef1.tar.gz |
Merge pull request #674 from ujifgc/be-quiet
add quiet mode of rack server, rackup --quiet
-rw-r--r-- | lib/rack/server.rb | 5 | ||||
-rw-r--r-- | test/spec_server.rb | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/rack/server.rb b/lib/rack/server.rb index d2f0b954..42afb742 100644 --- a/lib/rack/server.rb +++ b/lib/rack/server.rb @@ -30,6 +30,9 @@ module Rack opts.on("-w", "--warn", "turn warnings on for your script") { options[:warn] = true } + opts.on("-q", "--quiet", "turn off logging") { + options[:quiet] = true + } opts.on("-I", "--include PATH", "specify $LOAD_PATH (may be used more than once)") { |path| @@ -208,7 +211,7 @@ module Rack class << self def logging_middleware lambda { |server| - server.server.name =~ /CGI/ ? nil : [Rack::CommonLogger, $stderr] + server.server.name =~ /CGI/ || server.options[:quiet] ? nil : [Rack::CommonLogger, $stderr] } end diff --git a/test/spec_server.rb b/test/spec_server.rb index 01b4f562..6692c99e 100644 --- a/test/spec_server.rb +++ b/test/spec_server.rb @@ -61,6 +61,11 @@ describe Rack::Server do end end + should "be quiet if said so" do + server = Rack::Server.new(:app => "FOO", :quiet => true) + Rack::Server.logging_middleware.call(server).should.eql(nil) + end + should "not force any middleware under the none configuration" do server = Rack::Server.new(:app => 'foo') server.default_middleware_by_environment['none'].should.be.empty |