rescue ActiveRecord::LockWaitTimeout errors on import

datacite · Dec 16, 2018 · 72a25e3 · 72a25e3
1 parent 46a4581
commit 72a25e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/doi.rb b/app/models/doi.rb
@@ -383,7 +383,7 @@ def self.import_by_day(options={})
         end.to_h.merge(schema_version: meta["schema_version"] || "http://datacite.org/schema/kernel-4", version_info: meta["version"], xml: string)
 
         doi.update_columns(attrs)
-      rescue TypeError, NoMethodError => error
+      rescue TypeError, NoMethodError, ActiveRecord::LockWaitTimeout => error
         logger.error "[MySQL] Error importing metadata for " + doi.doi + ": " + error.message
       else
         count += 1

diff --git a/vendor/middleman/source/index.html.md b/vendor/middleman/source/index.html.md
@@ -5,6 +5,6 @@ description: The API to interact with all DataCite resources.
 ---
 
 The DataCite REST API allows users to interact with DataCite resources such as dois, clients, providers and prefixes. Please use 
-[DataCite Search](https://search.datacite.org) or [DOI Fabrica](https://doi.datacite.org) (for members and clients) if you are looking for a web interface. The API follows the [JSONAPI](http://jsonapi.org/) specification. The API requires authentication for some actions.
+[DataCite Search](https://search.datacite.org) or [DOI Fabrica](https://doi.datacite.org) (members and clients) if you are looking for a web interface. The API follows the [JSONAPI](http://jsonapi.org/) specification, and requires authentication for some actions.
 
 You will find more information about the REST API in our [documentation portal](https://support.datacite.org/docs/api).