From b32099e13b51a26b8013fa69d7ec8acfe5ceb2b7 Mon Sep 17 00:00:00 2001 From: Sdogruyol Date: Sat, 9 Apr 2016 17:20:39 +0300 Subject: [PATCH] Move server from local scope to config --- src/kemal.cr | 8 ++++---- src/kemal/config.cr | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/kemal.cr b/src/kemal.cr index 3698bcf..c239202 100644 --- a/src/kemal.cr +++ b/src/kemal.cr @@ -8,12 +8,12 @@ module Kemal config.setup config.add_handler Kemal::RouteHandler::INSTANCE - server = HTTP::Server.new(config.host_binding.not_nil!, config.port, config.handlers) - server.ssl = config.ssl + config.server = HTTP::Server.new(config.host_binding.not_nil!, config.port, config.handlers) + config.server.ssl = config.ssl Signal::INT.trap { config.logger.write "Kemal is going to take a rest!\n" - server.close + config.server.close exit } @@ -31,6 +31,6 @@ module Kemal end config.logger.write "[#{config.env}] Kemal is ready to lead at #{config.scheme}://#{config.host_binding}:#{config.port}\n" - server.listen + config.server.listen end end diff --git a/src/kemal/config.cr b/src/kemal/config.cr index f9b6b6b..724734c 100644 --- a/src/kemal/config.cr +++ b/src/kemal/config.cr @@ -2,8 +2,11 @@ module Kemal class Config INSTANCE = Config.new HANDLERS = [] of HTTP::Handler + + @server : HTTP::Server + property host_binding, ssl, port, env, public_folder, logging, - always_rescue, error_handler, serve_static, run + always_rescue, error_handler, serve_static, server def initialize @host_binding = "0.0.0.0" @@ -15,7 +18,6 @@ module Kemal @logger = nil @always_rescue = true @error_handler = nil - @run = false end def logger