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) (unidiff) | |
tree | 0b3b969e0da227862edd1210203b560996c877b8 /backend/node | |
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 | |||
@@ -53,33 +53,33 @@ var CLIPPERZ = module.exports = function(CONFIG) { | |||
53 | var t1=new Date(), dt=t1-t0; | 53 | var t1=new Date(), dt=t1-t0; |
54 | LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount},"SQL query '%s' took %dms",q,dt); | 54 | LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount},"SQL query '%s' took %dms",q,dt); |
55 | cb(e,r); | 55 | cb(e,r); |
56 | }); | 56 | }); |
57 | }, | 57 | }, |
58 | commit: function(cb) { | 58 | commit: function(cb) { |
59 | LOGGER.trace('SQL: commit'); | 59 | LOGGER.trace('SQL: commit'); |
60 | if(this.over) return cb(new Error('game over')); | 60 | if(this.over) return cb(new Error('game over')); |
61 | return (this.over=true),C.query('COMMIT',function(e){D();cb&&cb(e)}); | 61 | return (this.over=true),C.query('COMMIT',function(e){D();cb&&cb(e)}); |
62 | }, | 62 | }, |
63 | rollback: function(cb) { | 63 | rollback: function(cb) { |
64 | LOGGER.trace('SQL: rollback'); | 64 | LOGGER.trace('SQL: rollback'); |
65 | if(this.over) return cb(new Error('game over')); | 65 | if(this.over) return cb(new Error('game over')); |
66 | return (this.over=true),C.query('ROLLBACK',function(e){D();cb&&cb(e)}); | 66 | return (this.over=true),C.query('ROLLBACK',function(e){D();cb&&cb(e)}); |
67 | }, | 67 | }, |
68 | end: function(e,cb) { | 68 | end: function(e,cb) { |
69 | if(e) LOGGER.trace(e,"rolling back transaction due to an error"),this.rollback(cb); | 69 | if(e) return LOGGER.trace(e,"rolling back transaction due to an error"),this.rollback(cb); |
70 | this.commit(cb); | 70 | this.commit(cb); |
71 | } | 71 | } |
72 | }); | 72 | }); |
73 | }); | 73 | }); |
74 | }); | 74 | }); |
75 | } | 75 | } |
76 | }; | 76 | }; |
77 | 77 | ||
78 | 78 | ||
79 | return { | 79 | return { |
80 | 80 | ||
81 | json: function clipperz_json(req,res,cb) { | 81 | json: function clipperz_json(req,res,cb) { |
82 | var method = req.body.method, pp = JSON.parse(req.body.parameters).parameters; | 82 | var method = req.body.method, pp = JSON.parse(req.body.parameters).parameters; |
83 | var message = pp.message; | 83 | var message = pp.message; |
84 | var ppp = pp.parameters; | 84 | var ppp = pp.parameters; |
85 | res.res = function(o) { return res.json({result:o}) }; | 85 | res.res = function(o) { return res.json({result:o}) }; |