diff options
| author | evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9> | 2007-10-31 23:32:32 +0000 |
|---|---|---|
| committer | evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9> | 2007-10-31 23:32:32 +0000 |
| commit | bb5022e7f729fb8b1ea4c18cc336a410abc7a905 (patch) | |
| tree | 3e70f4689f7aa6f79fd0e52bae1d25225654a0f4 /lib/mongrel.rb | |
| parent | 4e40f52863e5b922aefd49fbf5a08f7447bd3951 (diff) | |
| download | unicorn-bb5022e7f729fb8b1ea4c18cc336a410abc7a905.tar.gz | |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@852 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'lib/mongrel.rb')
| -rw-r--r-- | lib/mongrel.rb | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/lib/mongrel.rb b/lib/mongrel.rb index 2559eac..5cde698 100644 --- a/lib/mongrel.rb +++ b/lib/mongrel.rb @@ -1,6 +1,5 @@ require 'socket' -require 'http11' require 'tempfile' require 'yaml' require 'time' @@ -8,20 +7,13 @@ require 'etc' require 'uri' require 'stringio' -begin - require 'fastthread' -rescue LoadError, RuntimeError - require 'rubygems' and retry -ensure - require 'thread' -end +require 'mongrel/gems' -begin - require 'cgi_multipart_eof_fix' -rescue LoadError - require 'rubygems' and retry -end +Mongrel::Gems.require 'cgi_multipart_eof_fix' +Mongrel::Gems.require 'fastthread' +require 'thread' +require 'http11' require 'mongrel/cgi' require 'mongrel/handlers' require 'mongrel/command' @@ -347,16 +339,5 @@ end # Load experimental library, if present. We put it here so it can override anything # in regular Mongrel. -begin - # Look for SVN version - $LOAD_PATH.unshift 'projects/mongrel_experimental/lib/' - require 'mongrel_experimental' -rescue LoadError - begin - # Look for gem - gem 'mongrel_experimental', '=1.1' if respond_to? 'gem' - require 'mongrel_experimental' - rescue LoadError - # Not found - end -end +$LOAD_PATH.unshift 'projects/mongrel_experimental/lib/' +Mongrel::Gems.require 'mongrel_experimental', '=1.1' |