|
@@ -93,7 +93,7 @@ module.exports = app => {
|
|
const ziparchiver = archiver('zip');
|
|
const ziparchiver = archiver('zip');
|
|
const outputPath = fs.createWriteStream(path.resolve(this.app.baseDir, zipPath));
|
|
const outputPath = fs.createWriteStream(path.resolve(this.app.baseDir, zipPath));
|
|
outputPath.on('error', err => {
|
|
outputPath.on('error', err => {
|
|
- reject(err);
|
|
|
|
|
|
+ return reject(err);
|
|
});
|
|
});
|
|
|
|
|
|
ziparchiver.pipe(outputPath);
|
|
ziparchiver.pipe(outputPath);
|
|
@@ -103,20 +103,20 @@ module.exports = app => {
|
|
|
|
|
|
// 存档警告
|
|
// 存档警告
|
|
ziparchiver.on('warning', function(err) {
|
|
ziparchiver.on('warning', function(err) {
|
|
- if (err.code === 'ENOENT') {
|
|
|
|
- console.warn('stat故障和其他非阻塞错误');
|
|
|
|
- }
|
|
|
|
- reject(err);
|
|
|
|
|
|
+ // if (err.code === 'ENOENT') {
|
|
|
|
+ // console.warn('stat故障和其他非阻塞错误');
|
|
|
|
+ // }
|
|
|
|
+ return reject(err);
|
|
});
|
|
});
|
|
|
|
|
|
// 存档出错
|
|
// 存档出错
|
|
ziparchiver.on('error', function(err) {
|
|
ziparchiver.on('error', function(err) {
|
|
- console.log(err);
|
|
|
|
- reject(err);
|
|
|
|
|
|
+ // console.log(err);
|
|
|
|
+ return reject(err);
|
|
});
|
|
});
|
|
ziparchiver.finalize();
|
|
ziparchiver.finalize();
|
|
outputPath.on('close', () => {
|
|
outputPath.on('close', () => {
|
|
- resolve(ziparchiver.pointer());
|
|
|
|
|
|
+ return resolve(ziparchiver.pointer());
|
|
});
|
|
});
|
|
});
|
|
});
|
|
}
|
|
}
|