From 64d3271fb297d6fb4860483d93a8c08613994ed3 Mon Sep 17 00:00:00 2001
From: sdogruyol <dogruyolserdar@gmail.com>
Date: Mon, 5 Sep 2016 10:38:00 +0300
Subject: [PATCH] Make HTTP::Server uninitialized instead of HTTP::Server?

---
 src/kemal.cr        | 8 ++++----
 src/kemal/config.cr | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/kemal.cr b/src/kemal.cr
index 1444b1a..6946313 100644
--- a/src/kemal.cr
+++ b/src/kemal.cr
@@ -11,8 +11,8 @@ module Kemal
     config.setup
     config.add_handler Kemal::RouteHandler::INSTANCE
 
-    config.server = HTTP::Server.new(config.host_binding.not_nil!, config.port, config.handlers)
-    config.server.not_nil!.tls = config.ssl
+    config.server = HTTP::Server.new(config.host_binding, config.port, config.handlers)
+    config.server.tls = config.ssl
 
     Kemal::Sessions.run_reaper!
 
@@ -26,7 +26,7 @@ module Kemal
     unless config.env == "test"
       Signal::INT.trap {
         config.logger.write "Kemal is going to take a rest!\n"
-        config.server.not_nil!.close
+        config.server.close
         exit
       }
 
@@ -40,7 +40,7 @@ module Kemal
       end
 
       config.logger.write "[#{config.env}] Kemal is ready to lead at #{config.scheme}://#{config.host_binding}:#{config.port}\n"
-      config.server.not_nil!.listen
+      config.server.listen
     end
   end
 end
diff --git a/src/kemal/config.cr b/src/kemal/config.cr
index 4583cf4..93d6165 100644
--- a/src/kemal/config.cr
+++ b/src/kemal/config.cr
@@ -9,7 +9,6 @@ module Kemal
     HANDLERS       = [] of HTTP::Handler
     ERROR_HANDLERS = {} of Int32 => HTTP::Server::Context -> String
     @ssl : OpenSSL::SSL::Context::Server?
-    @server : HTTP::Server?
 
     property host_binding, ssl, port, env, public_folder, logging,
       always_rescue, serve_static, server, extra_options
@@ -24,6 +23,7 @@ module Kemal
       @logger = nil
       @error_handler = nil
       @always_rescue = true
+      @server = uninitialized HTTP::Server
     end
 
     def logger