summaryrefslogtreecommitdiff
authorMichael Krelin <hacker@klever.net>2013-11-25 20:52:56 (UTC)
committer Michael Krelin <hacker@klever.net>2013-11-25 20:52:56 (UTC)
commitfab898af773b3bbf28ed6c67c89b032d740d19f1 (patch) (side-by-side diff)
tree0e7f59253d11556dcb29dc5372f7a77e91de086d
parent352f2216eec032efce4bdeddd2ffe5a9e326a99d (diff)
downloadclipperz-fab898af773b3bbf28ed6c67c89b032d740d19f1.zip
clipperz-fab898af773b3bbf28ed6c67c89b032d740d19f1.tar.gz
clipperz-fab898af773b3bbf28ed6c67c89b032d740d19f1.tar.bz2
PG: also tracelog error (if any)
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--backend/node/src/clipperz.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js
index 73af0a0..b98c00e 100644
--- a/backend/node/src/clipperz.js
+++ b/backend/node/src/clipperz.js
@@ -43,67 +43,67 @@ function clipperz_store(PG) {
return rv;
}
var srp_g = BIGNUM(2);
var srp_n = BIGNUM("115b8b692e0e045692cf280b436735c77a5a9e8a9e7ed56c965f87db5b2a2ece3",16);
var n123 = '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00';
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);
+ LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"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);
+ LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"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) return LOGGER.trace(e,"rolling back transaction due to an error"),this.rollback(cb);
this.commit(cb);
}
});
});
});
}
};