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

copy to events is series

Browse Source
This commit is contained in:
Simon Martín 2018-06-21 12:50:50 +02:00
parent 5fbd6e8e3a
commit 39dfcb1f9b
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/controllers/copy_controller.js
View File

@ -77,22 +77,6 @@ function handleCopyTo (logger) {
return next(err);
}
req.on('close', () => {
// Cancel the running COPY TO query
// See https://www.postgresql.org/docs/9.5/static/protocol-flow.html#PROTOCOL-COPY
const runningClient = client;
const cancelingClient = new Client(runningClient.connectionParameters);
cancelingClient.cancel(runningClient, pgstream);
const err = new Error('Connection closed by client');
metrics.end(null, err);
pgstream.unpipe(res);
// see https://node-postgres.com/api/pool#releasecallback
done(err);
return next(err);
});
pgstream
.on('data', data => metrics.addSize(data.length))
.on('error', (err) => {
@ -103,6 +87,21 @@ function handleCopyTo (logger) {
})
.on('end', () => metrics.end(copyToStream.rowCount))
.pipe(res)
.on('close', () => {
// Cancel the running COPY TO query
// See https://www.postgresql.org/docs/9.5/static/protocol-flow.html#PROTOCOL-COPY
const runningClient = client;
const cancelingClient = new Client(runningClient.connectionParameters);
cancelingClient.cancel(runningClient, pgstream);
const err = new Error('Connection closed by client');
metrics.end(null, err);
pgstream.unpipe(res);
// see https://node-postgres.com/api/pool#releasecallback
done(err);
return next(err);
})
.on('error', err => {
metrics.end(null, err);
pgstream.unpipe(res);