cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test a solution

Browse Source
This commit is contained in:
cgonzalez 2021-03-24 10:15:27 +00:00
parent 2c1700b3bd
commit acff0c0413
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/models/formats/ogr.js
View File

@ -327,12 +327,11 @@ function ExportRequest (ostream, callback, beforeSink) {
this.canceled = false; this.canceled = false;
var that = this; var that = this;
logger.info({ custom: true }, 'New export request');
this.ostream.on('close', function () { this.ostream.on('close', function () {
logger.info({ custom: true }, 'Stream closed'); logger.info({ custom: true }, 'Stream closed');
that.canceled = true; that.canceled = true;
if (that.istream) { if (that.istream) {
logger.info({ custom: true }, 'Destroying stream');
that.istream.destroy(); that.istream.destroy();
} }
}).on('pipe', function(src) { }).on('pipe', function(src) {
@ -345,9 +344,9 @@ ExportRequest.prototype.sendFile = function (err, filename, callback) {
logger.info({ custom: true }, 'There is an error sending file'); logger.info({ custom: true }, 'There is an error sending file');
return callback(err); return callback(err);
} }
logger.info({ custom: true }, 'sendFile'); logger.info({ custom: true, destroyed: this.ostream.connection.destroyed }, 'sendFile');
var that = this; var that = this;
if (!this.canceled) { if (!this.canceled && !this.ostream.connection.destroyed) {
logger.info({ custom: true }, 'Not cancelled (sending file)'); logger.info({ custom: true }, 'Not cancelled (sending file)');
this.istream = fs.createReadStream(filename) this.istream = fs.createReadStream(filename)
.on('open', function (/* fd */) { .on('open', function (/* fd */) {