Merge git://github.com/markbates/thin

macournoyer · Apr 22, 2008 · fa4eb39 · fa4eb39
2 parents ae6f5b5 + 863978d
commit fa4eb39
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/rack/adapter/loader.rb b/lib/rack/adapter/loader.rb
@@ -9,6 +9,7 @@ class AdapterNotFound < RuntimeError; end
     :ramaze  => "start.rb",
     :merb    => "config/init.rb",
     :halcyon => 'runner.ru',
+    :mack    => 'config/app_config/default.yml',
     :file    => nil
   }
 
@@ -57,6 +58,10 @@ def self.for(name, options={})
 
         return Halcyon::Runner.new
 
+      when :mack
+        ENV["MACK_ENV"] = options[:environment]
+        require 'mack'
+        return Mack::Utils::Server.build_app
       when :file
         return Rack::File.new(options[:chdir])