diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-06-21 15:42:06 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-21 15:42:06 +0300 |
commit | 77f607d49fb632a87c53c3513a2f5fcf7c66a185 (patch) | |
tree | 86efa169c5b0d1a06466e7cd91af968f84d403a3 /plugins/BulkTracking | |
parent | 27842d7de0fa8ae248cf1ef31660994ba5569b4f (diff) |
Allow configuration of a shorter lock wait time in tracker mode (#16092)
* Allow configuration of a shorter lock wait time in tracker mode
* do not catch errors for single tracking request
* Update global.ini.php
Diffstat (limited to 'plugins/BulkTracking')
-rw-r--r-- | plugins/BulkTracking/Tracker/Handler.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/plugins/BulkTracking/Tracker/Handler.php b/plugins/BulkTracking/Tracker/Handler.php index 482b77bf70..dd77b168c6 100644 --- a/plugins/BulkTracking/Tracker/Handler.php +++ b/plugins/BulkTracking/Tracker/Handler.php @@ -60,6 +60,13 @@ class Handler extends Tracker\Handler $invalidRequests[] = $index; } catch (InvalidRequestParameterException $ex) { $invalidRequests[] = $index; + } catch (Exception $e) { + if (stripos($e->getMessage(), 'Lock wait timeout exceeded') + || Tracker::getDatabase()->isErrNo($e, 1205)) { + continue; + } else { + throw $e; + } } } |