aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/info_request.rb
Commit message (Collapse)AuthorAgeLines
* Merge branch 'release/0.9' into rails-3-developLouise Crow2013-04-24-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/public_body_controller.rb app/mailers/track_mailer.rb app/views/request/_hidden_correspondence.html.erb app/views/request/_sidebar.html.erb app/views/request/hidden.html.erb app/views/request/new_please_describe.html.erb app/views/request/preview.html.erb app/views/user/show.html.erb config/environment.rb config/routes.rb spec/controllers/public_body_controller_spec.rb
| * Fix the deadlock on dealing with incoming emailMark Longair2013-04-18-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #336 There was an occasional deadlock when two emails for the same request came in near-simultaneously; two processes would be started via script/mailin, each to deal with one email which are both updating the same InfoRequest. The error would look like: 2013-04-07 09:19:03 BST [13398]: [2-1] DETAIL: Process 13398 waits for ShareLock on transaction 36193647; blocked by process 13397. Process 13397 waits for ExclusiveLock on tuple (390,35) of relation 32918788 of database 32918687; blocked by process 13398. Process 13398: UPDATE "info_requests" SET "updated_at" = '2013-04-07 08:19:02.139515', "awaiting_description" = 't' WHERE "id" = 156200 Process 13397: UPDATE "info_requests" SET "updated_at" = '2013-04-07 08:19:02.143624', "awaiting_description" = 't' WHERE "id" = 156200 This arose from the following section of code: ActiveRecord::Base.transaction do raw_email = RawEmail.new incoming_message.raw_email = raw_email incoming_message.info_request = self incoming_message.save! raw_email.data = raw_email_data raw_email.save! self.awaiting_description = true params = { :incoming_message_id => incoming_message.id } if !rejected_reason.empty? params[:rejected_reason] = rejected_reason.to_str end self.log_event("response", params) self.save! end Matthew Somerville explained what was happening here in the issue report; to repeat his explanation from the bug report, both processes enter the transaction block and acquire a ShareLock on self with: incoming_message.info_request = self incoming_message.save! However, in order to update the self.awaiting_description field of the InfoRequest, with: self.awaiting_description = true [...] self.save! ... the ShareLock needs to be upgraded to an ExclusiveLock, but both will wait until the other's ShareLock is released, which would only happen at the end of the transaction. We can avoid this deadlock by using SELECT ... FOR UPDATE for the row in info_requests. In Rails 3.2.0 there is ActiveRecord support for this (via with_lock and lock! on a model instance) but so as not to require upgrading rails, I'm just using raw SQL.
* | Fix up some merge action from f60ada47d4e7aabe0dce152109cb0d91865929daHenare Degan2013-03-15-1/+1
| |
* | Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-76/+80
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/admin_request_controller.rb app/controllers/admin_track_controller.rb app/controllers/request_controller.rb app/controllers/services_controller.rb app/helpers/link_to_helper.rb app/mailers/request_mailer.rb app/models/application_mailer.rb app/models/info_request.rb app/views/admin_censor_rule/edit.html.erb app/views/admin_censor_rule/new.html.erb app/views/admin_public_body/_form.html.erb app/views/admin_public_body/_locale_selector.html.erb app/views/admin_public_body/_one_list.html.erb app/views/admin_public_body/edit.html.erb app/views/admin_public_body/list.html.erb app/views/admin_public_body/new.html.erb app/views/admin_request/_incoming_message_actions.html.erb app/views/admin_request/edit.html.erb app/views/admin_request/edit_comment.html.erb app/views/admin_request/edit_outgoing.html.erb app/views/admin_request/list.html.erb app/views/admin_request/list_old_unclassified.html.erb app/views/admin_request/show.html.erb app/views/admin_track/_some_tracks.html.erb app/views/admin_track/list.html.erb app/views/admin_user/edit.html.erb app/views/admin_user/list.html.erb app/views/admin_user/show.html.erb app/views/general/_footer.html.erb app/views/general/exception_caught.html.erb app/views/help/contact.html.erb app/views/layouts/default.html.erb app/views/public_body/_alphabet.html.erb app/views/request/_request_listing_single.html.erb app/views/request/_sidebar.html.erb app/views/request/new.html.erb app/views/request/show.html.erb app/views/request_mailer/external_response.rhtml app/views/request_mailer/fake_response.rhtml config/environment.rb config/environments/production.rb config/routes.rb spec/controllers/admin_censor_rule_controller_spec.rb spec/controllers/request_controller_spec.rb spec/controllers/track_controller_spec.rb spec/helpers/link_to_helper_spec.rb spec/mailers/request_mailer_spec.rb spec/models/info_request_spec.rb spec/spec_helper.rb spec/views/public_body/show.html.erb_spec.rb spec/views/request/show.html.erb_spec.rb vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
| * Refactor functionality from controller to modelMatthew Landauer2013-03-04-0/+15
| |
| * When setting a state optionally pass a messsageMatthew Landauer2013-03-02-2/+2
| |
| * Simplify method by using array to store mappingMatthew Landauer2013-03-02-39/+24
| |
| * InfoRequestEvent should know about its event typesMatthew Landauer2013-03-02-2/+2
| |
| * Extract methodMatthew Landauer2013-03-02-6/+5
| |
| * Simplify methodsMatthew Landauer2013-03-02-19/+7
| |
| * Simplify logic in methodMatthew Landauer2013-03-02-7/+2
| |
| * Inline methodMatthew Landauer2013-03-02-11/+1
| |
| * Inline methodMatthew Landauer2013-03-02-6/+1
| |
* | Rename Configuration class to avoid conflict with ActiveSupport::ConfigurableHenare Degan2013-03-03-7/+7
| |
* | Remove Tmail and use the Mail gem under Ruby 1.8.7 as wellHenare Degan2013-02-27-8/+0
| |
* | Update to new mail sending APIHenare Degan2013-02-25-2/+2
| |
* | New way of sending an emailHenare Degan2013-02-25-1/+1
| |
* | Under Ruby 1.9 this saved to the DB as a Ruby ActiveSupport::SafeBuffer ↵Henare Degan2013-02-21-1/+1
| | | | | | | | object but we want it saved as a String
* | Remove deprecated constants - #589Henare Degan2013-02-20-1/+1
| |
* | Looks like this is different in the older version of Mail tooHenare Degan2013-02-10-1/+1
| |
* | Added a bit of a safety net. It's an ugly temporary hack to make debugging ↵Matthew Landauer2013-01-31-0/+8
| | | | | | | | easier
* | Workaround for setting default value on attribute when exists? is calledMatthew Landauer2013-01-29-2/+7
| |
* | Don't need both url_helpersHenare Degan2013-01-25-1/+0
| |
* | Merge branch 'rails_xss' into rails-3-spikeMatthew Landauer2013-01-25-2/+2
|\| | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock config/environment.rb lib/i18n_fixes.rb
| * Merge remote-tracking branch 'mysociety/develop' into rails_xssMatthew Landauer2013-01-15-3/+3
| |\
| * | More escaping fixesMatthew Landauer2013-01-15-2/+2
| | |
* | | Overwriting validate_on_create in your models has been deprecatedHenare Degan2012-12-12-13/+15
| | |
* | | Method-style callbacks are deprecated for after_initializeHenare Degan2012-12-11-10/+14
| | |
* | | include ActionController::UrlWriter is deprecatedHenare Degan2012-12-11-1/+1
| | |
* | | named_scope has been renamed to scopeHenare Degan2012-12-11-1/+1
| |/ |/|
* | Delegate getting the from address of an incoming mail to the mail handler.Louise Crow2012-12-03-2/+2
| |
* | Standardize slug generation for external users so that it uses the same ↵Louise Crow2012-11-29-1/+1
|/ | | | underlying method as other slug generation. Fixes #567.
* Merge remote-tracking branch 'origin/feature/isolate-mail-handling' into developLouise Crow2012-11-20-3/+3
|\
| * Move address_from_name_and_email to mail handler.Louise Crow2012-11-15-3/+3
| |
* | Handle a request for json on a an external request - return the user_name ↵Louise Crow2012-11-19-1/+5
|/ | | | attribute instead of a full user model. Fixes #715.
* Move access to mail message id to incoming message.Louise Crow2012-11-15-2/+1
|
* Rubyise loop.Louise Crow2012-11-15-1/+1
|
* Refactor access to the mail object - only from incoming_message.Louise Crow2012-11-15-6/+1
|
* Handle the default blank string passed by Configuration moduleLouise Crow2012-10-25-1/+1
|
* Add an option to calls to calculate_status and display_status to specify ↵Louise Crow2012-10-23-7/+6
| | | | that the method can return a value cached on the object by a previous call.
* In number of requests shown on home page only include requests with normal ↵Matthew Landauer2012-10-17-0/+2
| | | | prominence
* Rename models and tables exim -> mail_serverMatthew Landauer2012-10-11-3/+3
|
* Extract configuration with defaults into one moduleMatthew Landauer2012-09-25-12/+7
|
* Merge remote-tracking branch 'openaustralia_github/calendar_days' into developLouise Crow2012-09-24-3/+5
|\
| * Make the way number of days are calculated (either by calendar or working ↵Matthew Landauer2012-09-24-3/+5
| | | | | | | | days) configurable
| * Fix: configuration for very late number of days wasn't being usedMatthew Landauer2012-09-24-2/+2
| |
| * Rename methodMatthew Landauer2012-09-24-3/+3
| |
* | Add an option to disable comments on a requestRobin Houston2012-09-19-0/+2
|/ | | | Closes #30.
* Allow InfoRequest.find_old_unclassified to accept an offset param so it can ↵Louise Crow2012-09-13-2/+3
| | | | be used in conjunction with pagination.
* Add a counter cache for the number of info_requests associated with public ↵Louise Crow2012-09-12-1/+1
| | | | bodies.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-20 08:31:11 +0000