From 6fbad555d05bd3ac3735adf7abdca08927cfee25 Mon Sep 17 00:00:00 2001 From: Serdar Dogruyol Date: Sat, 17 Mar 2018 17:58:19 +0300 Subject: [PATCH] Remove unused stuff --- src/kemal.cr | 2 ++ src/kemal/config.cr | 1 - src/kemal/ext/request.cr | 1 - src/kemal/handler.cr | 1 + src/kemal/init_handler.cr | 1 + src/kemal/log_handler.cr | 2 -- src/kemal/route_handler.cr | 1 + src/kemal/websocket_handler.cr | 1 + 8 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/kemal.cr b/src/kemal.cr index 713b1d7..1574fac 100644 --- a/src/kemal.cr +++ b/src/kemal.cr @@ -60,9 +60,11 @@ module Kemal end config.server ||= HTTP::Server.new(config.host_binding, config.port, config.handlers) + {% if !flag?(:without_openssl) %} config.server.not_nil!.tls = config.ssl {% end %} + config.running = true yield config diff --git a/src/kemal/config.cr b/src/kemal/config.cr index 8f7ff8b..0ef8be6 100644 --- a/src/kemal/config.cr +++ b/src/kemal/config.cr @@ -18,7 +18,6 @@ module Kemal @ssl : OpenSSL::SSL::Context::Server? {% end %} - getter custom_handler_position property host_binding, ssl, port, env, public_folder, logging, running property always_rescue, server : HTTP::Server?, extra_options, shutdown_message property serve_static : (Bool | Hash(String, Bool)) diff --git a/src/kemal/ext/request.cr b/src/kemal/ext/request.cr index 2f4a46e..bc0569b 100644 --- a/src/kemal/ext/request.cr +++ b/src/kemal/ext/request.cr @@ -13,7 +13,6 @@ class HTTP::Request # Checks if method contained in _method param is valid one def self.override_method_valid?(override_method : String) - return false unless override_method.is_a?(String) override_method = override_method.upcase override_method == "PUT" || override_method == "PATCH" || override_method == "DELETE" end diff --git a/src/kemal/handler.cr b/src/kemal/handler.cr index 0910eca..cae01b5 100644 --- a/src/kemal/handler.cr +++ b/src/kemal/handler.cr @@ -5,6 +5,7 @@ module Kemal # These methods are useful for the conditional execution of custom handlers . class Handler include HTTP::Handler + @@only_routes_tree = Radix::Tree(String).new @@exclude_routes_tree = Radix::Tree(String).new diff --git a/src/kemal/init_handler.cr b/src/kemal/init_handler.cr index 4728949..a098697 100644 --- a/src/kemal/init_handler.cr +++ b/src/kemal/init_handler.cr @@ -3,6 +3,7 @@ module Kemal # *Content-Type* or *X-Powered-By* headers. class InitHandler include HTTP::Handler + INSTANCE = new def call(context : HTTP::Server::Context) diff --git a/src/kemal/log_handler.cr b/src/kemal/log_handler.cr index 2256492..ede519c 100644 --- a/src/kemal/log_handler.cr +++ b/src/kemal/log_handler.cr @@ -1,8 +1,6 @@ module Kemal # Uses `STDOUT` by default and handles the logging of request/response process time. class LogHandler < Kemal::BaseLogHandler - @io : IO - def initialize(@io : IO = STDOUT) end diff --git a/src/kemal/route_handler.cr b/src/kemal/route_handler.cr index 8804911..6e39603 100644 --- a/src/kemal/route_handler.cr +++ b/src/kemal/route_handler.cr @@ -3,6 +3,7 @@ require "radix" module Kemal class RouteHandler include HTTP::Handler + INSTANCE = new property routes diff --git a/src/kemal/websocket_handler.cr b/src/kemal/websocket_handler.cr index e2fe609..dd31bf8 100644 --- a/src/kemal/websocket_handler.cr +++ b/src/kemal/websocket_handler.cr @@ -1,6 +1,7 @@ module Kemal class WebSocketHandler include HTTP::Handler + INSTANCE = new property routes