lib/yodel/command/command.rb in yodel-0.0.4 vs lib/yodel/command/command.rb in yodel-0.0.7

@@ -36,11 +36,10 @@
 
 
     case command
     when 'server'
       require '../requires'
-      require '../middleware/development_server'
       
       Yodel.config.extensions_folder = $extensions_folder if $extensions_folder
       Yodel.config.web_port = $web_port if $web_port
       
       if $env == 'production'
@@ -48,12 +47,14 @@
       else
         Yodel.env.development!
       end
       
       if $reload
+        require '../middleware/development_server'
         Rack::Server.start(app: DevelopmentServer.new, Port: Yodel.config.web_port)
       else
-        require File.expand_path('../../yodel')
+        require '../middleware/rack_server'
+        require '../../yodel'
         Rack::Server.start(app: Application.new, Port: Yodel.config.web_port)
       end
   
     when 'dns'
       require '../requires'