Merge commit '222efc9ba28afdc0f368568bd493695f593cc095'

codebutler · Jun 8, 2011 · 00ed7f1 · 00ed7f1
2 parents c383790 + 222efc9
commit 00ed7f1
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/lib/geocoder/us/rest.rb b/lib/geocoder/us/rest.rb
@@ -1,24 +1,13 @@
 require 'sinatra'
 require 'geocoder/us/database'
 require 'json'
-require 'timeout'
 
 @@db = Geocoder::US::Database.new(ENV["GEOCODER_DB"] || ARGV[0])
 
 set :port, 8081
 get '/geocode' do
   if params[:q]
-    results = []
-    begin
-      # TODO: remove this Timeout call?
-      # Read this blog post to see why Timeout is very dangerous:
-      # http://blog.headius.com/2008/02/ruby-threadraise-threadkill-timeoutrb.html
-      Timeout.timeout(1.0) do
-        results = @@db.geocode params[:q]
-      end
-    rescue Timeout::Error
-      $stderr.print "Timed out on '#{params[:q]}'\n"
-    end
+    results = @@db.geocode params[:q]
     features = []
     results.each do |result|
       coords = [result.delete(:lon), result.delete(:lat)]