author | Michael Krelin <hacker@klever.net> | 2013-11-25 18:57:36 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2013-11-25 18:57:36 (UTC) |
commit | 2c9aa9d30d3b833954b4fa584293e6e5a817f102 (patch) (side-by-side diff) | |
tree | 0b3b969e0da227862edd1210203b560996c877b8 /backend/node/src/clipperz.js | |
parent | bcfe3d4f277b5d87e5c3fd56479e07f194a37144 (diff) | |
download | clipperz-2c9aa9d30d3b833954b4fa584293e6e5a817f102.zip clipperz-2c9aa9d30d3b833954b4fa584293e6e5a817f102.tar.gz clipperz-2c9aa9d30d3b833954b4fa584293e6e5a817f102.tar.bz2 |
PG: don't try to commit after rolling back
-rw-r--r-- | backend/node/src/clipperz.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js index 6c13f16..6bf56bb 100644 --- a/backend/node/src/clipperz.js +++ b/backend/node/src/clipperz.js @@ -21,97 +21,97 @@ var CLIPPERZ = module.exports = function(CONFIG) { var LOGGER = CONFIG.logger||{trace:function(){}}; var PG = { url: CONFIG.psql, PG: require('pg').native, Q: function(q,a,cb) { if('function'===typeof a) cb=a,a=[]; LOGGER.trace({query:q,args:a},'SQL: %s',q); PG.PG.connect(PG.url,function(e,C,D) { if(e) return cb(e); var t0=new Date(); C.query(q,a,function(e,r) { var t1=new Date(), dt=t1-t0; D(); LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount},"SQL query '%s' took %dms",q,dt); cb(e,r); }); }); }, T: function(cb) { PG.PG.connect(PG.url,function(e,C,D) { if(e) return cb(e); C.query('BEGIN',function(e){ if(e) return D(),cb(e); cb(null,{ Q: function(q,a,cb) { LOGGER.trace({query:q,args:a},'SQL: %s',q); if(this.over) return cb(new Error('game over')); if('function'===typeof a) cb=a,a=[]; var t0=new Date(); C.query(q,a,function(e,r) { var t1=new Date(), dt=t1-t0; LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount},"SQL query '%s' took %dms",q,dt); cb(e,r); }); }, commit: function(cb) { LOGGER.trace('SQL: commit'); if(this.over) return cb(new Error('game over')); return (this.over=true),C.query('COMMIT',function(e){D();cb&&cb(e)}); }, rollback: function(cb) { LOGGER.trace('SQL: rollback'); if(this.over) return cb(new Error('game over')); return (this.over=true),C.query('ROLLBACK',function(e){D();cb&&cb(e)}); }, end: function(e,cb) { - if(e) LOGGER.trace(e,"rolling back transaction due to an error"),this.rollback(cb); + if(e) return LOGGER.trace(e,"rolling back transaction due to an error"),this.rollback(cb); this.commit(cb); } }); }); }); } }; return { json: function clipperz_json(req,res,cb) { var method = req.body.method, pp = JSON.parse(req.body.parameters).parameters; var message = pp.message; var ppp = pp.parameters; res.res = function(o) { return res.json({result:o}) }; LOGGER.trace({method:method,parameters:pp},"JSON request"); switch(method) { case 'registration': switch(message) { case 'completeRegistration': return PG.Q( "INSERT INTO clipperz.theuser" +" (u_name, u_srp_s,u_srp_v, u_authversion,u_header,u_statistics,u_version,u_lock)" +" VALUES ($1, $2,$3, $4,$5,$6,$7,$8)", [pp.credentials.C, pp.credentials.s, pp.credentials.v, pp.credentials.version,pp.user.header, pp.user.statistics, pp.user.version, pp.user.lock], function(e,r) { if(e) return cb(e); res.res({lock:pp.user.lock,result:'done'}); }); } break; case 'handshake': switch(message) { case 'connect': return ASYNC.auto({ u: function(cb) { PG.Q( "SELECT u_id, u_srp_s, u_srp_v FROM clipperz.theuser WHERE u_name=$1", [ppp.C], function(e,r) { if(e) return cb(e); if(!r.rowCount) return cb(null,{u_id:null,u_srp_s:n123,u_srp_v:n123}); cb(null,r.rows[0]); }) }, otp: ['u',function(cb,r) { if(!req.session.otp) return cb(); if(req.session.u!=r.u.u_id) return cb(new Error('user/OTP mismatch')); PG.Q( |