Bug 967504 - web console now properly handling app creation timeout

console/app/controllers/applications_controller.rb

@@ -150,7 +150,14 @@ def create
     end
     @application.domain = @domain
 
-    if @application.save
+    saved = false
+    begin
+      saved = @application.save
+    rescue ActiveResource::TimeoutError
+      flash.now[:error] = "The application creation timed out. Your app is probably still being created in background. Please give it a couple minutes and check the 'My Applications' section."
+    end
+
+    if saved
       messages = @application.remote_results
 
       redirect_to get_started_application_path(@application, :wizard => true), :flash => {:info_pre => messages}

console/lib/active_resource/persistent_connection.rb

@@ -175,7 +175,7 @@ def request(method, path, *arguments)
       rescue OpenSSL::SSL::SSLError => e
         raise SSLError.new(e.message)
       rescue Net::HTTP::Persistent::Error => e
-        raise ConnectionError.new(e.message)
+        raise e.message.include?('Timeout::Error') ? TimeoutError.new(e.message) : ConnectionError.new(e.message)
       rescue Errno::ECONNREFUSED => e
         raise ServerRefusedConnection.new(site, req.path)
       end