summary refs log tree commit
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-26 17:25:20 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-26 17:25:20 -0600
commit43de60320ae895f29918d03b7d43d455a0c4d272 (patch)
treeeaee40a0e56ca3aadb4e21d88bf4737032136bc1
parente43e4d85baae52f29613a6721109ea5cd0fd18f2 (diff)
downloadrack-43de60320ae895f29918d03b7d43d455a0c4d272.tar.gz
Use "config" instead of "rack_file"
-rw-r--r--lib/rack/server.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rack/server.rb b/lib/rack/server.rb
index 7d0705ad..5f93bc66 100644
--- a/lib/rack/server.rb
+++ b/lib/rack/server.rb
@@ -74,7 +74,7 @@ module Rack
           end
         end
         opt_parser.parse! args
-        options[:rack_file] = args.last if args.last
+        options[:config] = args.last if args.last
         options
       end
     end
@@ -100,17 +100,17 @@ module Rack
         :Port        => 9292,
         :Host        => "0.0.0.0",
         :AccessLog   => [],
-        :rack_file   => ::File.expand_path("config.ru")
+        :config   => ::File.expand_path("config.ru")
       }
     end
 
     def app
       @app ||= begin
-        if !::File.exist? options[:rack_file]
-          abort "configuration #{options[:rack_file]} not found"
+        if !::File.exist? options[:config]
+          abort "configuration #{options[:config]} not found"
         end
 
-        app, options = Rack::Builder.parse_file(self.options[:rack_file], opt_parser)
+        app, options = Rack::Builder.parse_file(self.options[:config], opt_parser)
         self.options.merge! options
         app
       end