diff options
| -rw-r--r-- | lib/plum/rack/connection.rb | 3 | ||||
| -rw-r--r-- | lib/plum/rack/listener.rb | 8 | ||||
| -rw-r--r-- | lib/plum/rack/server.rb | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/lib/plum/rack/connection.rb b/lib/plum/rack/connection.rb index 17bdbc9..2ab33e5 100644 --- a/lib/plum/rack/connection.rb +++ b/lib/plum/rack/connection.rb @@ -19,7 +19,6 @@ module Plum begin @plum.run rescue Errno::EPIPE, Errno::ECONNRESET => e - @logger.debug("connection closed: #{e}") rescue StandardError => e @logger.error("#{e.class}: #{e.message}\n#{e.backtrace.map { |b| "\t#{b}" }.join("\n")}") end @@ -39,12 +38,10 @@ module Plum } stream.on(:headers) { |h| - @logger.debug("headers: " + h.map {|name, value| "#{name}: #{value}" }.join(" // ")) headers = h } stream.on(:data) { |d| - @logger.debug("data: #{d.bytesize}") data << d # TODO: store to file? } diff --git a/lib/plum/rack/listener.rb b/lib/plum/rack/listener.rb index 87d6179..83a3dff 100644 --- a/lib/plum/rack/listener.rb +++ b/lib/plum/rack/listener.rb @@ -61,15 +61,15 @@ module Plum private # returns: [cert, key] def dummy_key - key = OpenSSL::PKey::RSA.new(2048) - public_key = key.public_key + puts "WARNING: Generating new dummy certificate..." + key = OpenSSL::PKey::RSA.new(2048) cert = OpenSSL::X509::Certificate.new cert.subject = cert.issuer = OpenSSL::X509::Name.parse("/C=JP/O=Test/OU=Test/CN=example.com") cert.not_before = Time.now cert.not_after = Time.now + 363 * 24 * 60 * 60 - cert.public_key = public_key - cert.serial = 0x0 + cert.public_key = key.public_key + cert.serial = rand((1 << 20) - 1) cert.version = 2 ef = OpenSSL::X509::ExtensionFactory.new diff --git a/lib/plum/rack/server.rb b/lib/plum/rack/server.rb index 2a72d6e..496a375 100644 --- a/lib/plum/rack/server.rb +++ b/lib/plum/rack/server.rb @@ -3,7 +3,7 @@ module Plum class Server def initialize(app, config) @state = :null - @app = app + @app = config[:debug] ? ::Rack::CommonLogger.new(app) : app @logger = Logger.new(config[:log] || $stdout).tap { |l| l.level = config[:debug] ? Logger::DEBUG : Logger::INFO } @@ -26,7 +26,6 @@ module Plum } end rescue Errno::EBADF, Errno::ENOTSOCK, IOError => e # closed - @logger.debug("socket closed?: #{e}") rescue StandardError => e @logger.error("#{e.class}: #{e.message}\n#{e.backtrace.map { |b| "\t#{b}" }.join("\n")}") end |