verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

(231401) master to test #1466

Merged
alexm merged 29 commits from 231401_master_to_test into test 2023-04-21 10:38:37 +00:00
Conversation 0 Commits 29 Files Changed 22 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dc853213b8 - Show all commits

2
back/methods/image/scrub.js
View File

@ -52,7 +52,7 @@ module.exports = Self => {
const container = await $.ImageContainer.container(collection); const container = await $.ImageContainer.container(collection);
const rootPath = container.client.root; const rootPath = container.client.root;
const tx = await Self.beginTransaction({}); const tx = await Self.beginTransaction({timeout: null});
const opts = {transaction: tx}; const opts = {transaction: tx};
const lockName = 'salix.Image.scrub'; const lockName = 'salix.Image.scrub';

4
loopback/common/models/vn-model.js
View File

@ -21,8 +21,8 @@ module.exports = function(Self) {
let orgBeginTransaction = this.beginTransaction; let orgBeginTransaction = this.beginTransaction;
this.beginTransaction = function(options, cb) { this.beginTransaction = function(options, cb) {
options = options || {}; options = options || {};
if (!options.timeout) if (options.timeout === undefined)
options.timeout = 120000; options.timeout = 120 * 1000;
return orgBeginTransaction.call(this, options, cb); return orgBeginTransaction.call(this, options, cb);
}; };
}); });