c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

add a timeout to long-running last queries

Browse Source
This commit is contained in:
Lee Lawlor 2014-09-06 09:40:42 -04:00
parent 0cc4e1b540
commit ae9000572b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/feed_controller.rb
View File

@ -161,12 +161,20 @@ class FeedController < ApplicationController
# if last entry # if last entry
if params[:id] == 'last' && params[:field_id].present? && params[:field_id].to_i != 0 if params[:id] == 'last' && params[:field_id].present? && params[:field_id].to_i != 0
# look for a feed where the value isn't null begin
@feed = Feed.where(:channel_id => @channel.id) # add a timeout since this query may be really long if there is a lot of data,
.where("field? is not null", params[:field_id].to_i) # but the last instance of the field is very far back
.select(Feed.select_options(@channel, params)) Timeout::timeout(5) do
.order('entry_id desc') # look for a feed where the value isn't null
.first @feed = Feed.where(:channel_id => @channel.id)
.where("field? is not null", params[:field_id].to_i)
.select(Feed.select_options(@channel, params))
.order('entry_id desc')
.first
end
rescue Timeout::Error
rescue
end
# else get by entry # else get by entry
else else
# get most recent entry if necessary # get most recent entry if necessary