Skip to content

Business intelligence made simple

Default to 10 minutes if no timeout

Andrew Kane9371197ce192
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rb
index 5d34485d..699b21fc 100644
--- a/app/controllers/blazer/queries_controller.rb
+++ b/app/controllers/blazer/queries_controller.rb
@@ -93,9 +93,9 @@ module Blazer
@cached_at = nil
params[:data_source] = nil
render_run
- elsif Time.now > Time.at(@timestamp + (@data_source.timeout || 120).to_i)
- # timed out
- @error = Blazer::TIMEOUT_MESSAGE
+ elsif Time.now > Time.at(@timestamp + (@data_source.timeout || 600).to_i + 5)
+ # query lost
+ @error = "We lost your query :("
@rows = []
@columns = []
render_run