waitress-core 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54fb87588d72df10b89f0ec92115c35284ba4d16
-  data.tar.gz: 0cddde327a2e16e81af8ffdaffb691ad73306c76
+  metadata.gz: 904a18272ce3e1f837cb26e024248caaf9da1b3e
+  data.tar.gz: dbdbdcafbf43cee59d9a84aa0d0aeab759d6b731
 SHA512:
-  metadata.gz: cc0c61ad8c0ae667b8ef0fb4804ba0293a8540941b0e31bcd42da75006c0287f248aef460ac4e6360d165d66dec245cc9768f98b48059015a011f9d109996c21
-  data.tar.gz: aa03ee737f109dde2c9fe857b80ca0bd7f4ff030328749ecf8ac6e20fee6cd3a846b8bef852ba266cc3c624f0702d27f6d515e02e225829b4f7af97976af021d
+  metadata.gz: f403802ef5b0baff1a4c5cd3d54d9dc90c435d77e765fd770d7e44e774c0c86dcacd517a85022097c3cb1354e7b52523fc2fadc313958a670a2a4e7cb05ebe8b
+  data.tar.gz: ef03ff5d5d1fe612e44cceda6db4df092784c140ea2ba1b968c19351bc3a7e76fb264ed32159d5a170e2b7dd8c680e38f5a263be10f9adcd3b809d89e5c7115e

data/lib/waitress.rb

@@ -14,6 +14,7 @@ require 'waitress/handlers/handler'
 require 'waitress/handlers/dirhandler'
 require 'waitress/handlers/handler404'
 require 'waitress/handlers/libhandler'
+require 'waitress/handlers/handler500'
 require 'waitress/chef'
 require 'waitress/evalbind'
 require 'waitress/restful/restbuilder'

data/lib/waitress/configure.rb

@@ -29,6 +29,7 @@ module Waitress
         conf.hosts.each { |h| s << h }
         s.set_processes conf.processes
         s.ports *conf.ports
+        s.internal_error conf.internal_error
         s
       end
       puts "Waitress Configuration Complete"
@@ -84,11 +85,13 @@ module Waitress
     attr_accessor :hosts
     attr_accessor :ports
     attr_accessor :processes
+    attr_accessor :internal_error
 
     def initialize configure, *ports
       @ports = *ports
       @hosts = []
       @configure = configure
+      @internal_error = false
 
       @processes = 5
       @processes = ENV["WAITRESS_PROCESSES"].to_i if ENV.include? "WAITRESS_PROCESSES"
@@ -116,6 +119,11 @@ module Waitress
     def less_watch time
       Waitress::LESSWatcher.set_time time
     end
+    
+    # Set to true to enable 500 error backtraces in the browser
+    def detailed_500 enabled
+      @internal_error = enabled
+    end
 
     def to_s
       m = lambda { |a,x| x.nil? ? "" : "\r\n#{a}=#{x.inspect}" }

data/lib/waitress/handlers/handler500.rb

@@ -0,0 +1,28 @@
+module Waitress
+  
+  # The 500 Handler is a simple handler which is triggered when the server encounters an error
+  # in the serving of a request. If possible, the handler will alert the client of an internal 
+  # server error, and if applicable, will display a stacktrace. Stacktraces may be disabled
+  # in the server configuration.
+  class Handler500
+    def self.trigger client, server, error, backtrace
+      begin
+        client.write "HTTP/1.1 500 Internal Server Error\r\n"
+        client.write "Content-Type: text/html\r\n"
+        client.write "\r\n"
+        client.write "<center> <h1> 500 </h1> <h2> Internal Server Error </h2>"
+        
+        if backtrace
+          client.write "<h3> Error Backtrace: </h3>"
+          client.write "<div style='text-align: left; width: 50%'>"
+          client.write "<p> #{error.backtrace.join '<br>'} </p> </div>"
+        end
+        
+        client.write "<hr /> <h5> Waitress HTTP Server Version #{Waitress::VERSION} </h5> </center>"
+        client.close
+      rescue => e
+        # Do nothing, it's a lost cause
+      end
+    end
+  end
+end

data/lib/waitress/server.rb

@@ -21,6 +21,7 @@ module Waitress
       @ports = ports
       @processes = 5
       @processes = ENV["WAITRESS_PROCESSES"].to_i if ENV.include? "WAITRESS_PROCESSES"
+      @backtrace_500 = false
       @running_processes = []
     end
 
@@ -68,6 +69,11 @@ module Waitress
     def read_io io
       handle_client io
     end
+    
+    # Set to true to enable clients to view the 500 error backtrace
+    def internal_error enabled
+      @backtrace_500 = enabled
+    end
 
   :private
     def launch_port port
@@ -123,8 +129,9 @@ module Waitress
       rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL, Errno::EBADF
         client_socket.close rescue nil
       rescue => e
-        puts "Client Error: #{e}"
-        puts e.backtrace
+        # puts "Client Error: #{e}"
+        # puts e.backtrace
+        Handler500.trigger client_socket, self, e, @backtrace_500
       end
       client_socket.close rescue nil
     end

data/lib/waitress/version.rb

@@ -1,3 +1,3 @@
 module Waitress
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waitress-core
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jaci Brunning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -194,6 +194,7 @@ files:
 - lib/waitress/handlers/dirhandler.rb
 - lib/waitress/handlers/handler.rb
 - lib/waitress/handlers/handler404.rb
+- lib/waitress/handlers/handler500.rb
 - lib/waitress/handlers/libhandler.rb
 - lib/waitress/kernel.rb
 - lib/waitress/parse/query.rb