Changes
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2020-08-27 13:53:11 +02:00
parent ea4f561bcf
commit 6f3fb83cd7
2 changed files with 8 additions and 7 deletions

View File

@ -90,7 +90,9 @@ module.exports = Self => {
); );
} }
await fs.unlink(srcFilePath); if (fs.existsSync(filePath))
await fs.unlink(srcFilePath);
await tx.commit(); await tx.commit();
return newImage; return newImage;
} catch (e) { } catch (e) {

View File

@ -19,7 +19,6 @@ module.exports = Self => {
Self.downloadImages = async() => { Self.downloadImages = async() => {
const models = Self.app.models; const models = Self.app.models;
let image;
try { try {
const tempPath = path.join('/tmp/salix-image'); const tempPath = path.join('/tmp/salix-image');
@ -27,7 +26,7 @@ module.exports = Self => {
await fs.mkdir(tempPath, {recursive: true}); await fs.mkdir(tempPath, {recursive: true});
const timer = setInterval(async() => { const timer = setInterval(async() => {
image = await Self.findOne({where: {error: null}}); const image = await Self.findOne({where: {error: null}});
// Exit loop // Exit loop
if (!image) return clearInterval(timer); if (!image) return clearInterval(timer);
@ -62,9 +61,9 @@ module.exports = Self => {
await errorHandler(image.itemFk, error, filePath); await errorHandler(image.itemFk, error, filePath);
} }
}); });
}, 1500); }, 2500);
} catch (error) { } catch (error) {
await errorHandler(image.itemFk, error); throw new Error('Try-catch error: ', error);
} }
async function errorHandler(rowId, error, filePath) { async function errorHandler(rowId, error, filePath) {
@ -76,10 +75,10 @@ module.exports = Self => {
await row.updateAttribute('error', error); await row.updateAttribute('error', error);
if (filePath) if (filePath && fs.existsSync(filePath))
await fs.unlink(filePath); await fs.unlink(filePath);
} catch (error) { } catch (error) {
throw error; throw new Error('ErrorHandler error: ', error);
} }
} }
}; };