-rw-r--r-- | backend/node/src/clipperz.js | 4 |
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 | |||
@@ -55,43 +55,43 @@ var CLIPPERZ = module.exports = function(CONFIG) { | |||
55 | var PG = { | 55 | var PG = { |
56 | url: CONFIG.psql, | 56 | url: CONFIG.psql, |
57 | PG: require('pg').native, | 57 | PG: require('pg').native, |
58 | Q: function(q,a,cb) { | 58 | Q: function(q,a,cb) { |
59 | if('function'===typeof a) cb=a,a=[]; | 59 | if('function'===typeof a) cb=a,a=[]; |
60 | LOGGER.trace({query:q,args:a},'SQL: %s',q); | 60 | LOGGER.trace({query:q,args:a},'SQL: %s',q); |
61 | PG.PG.connect(PG.url,function(e,C,D) { | 61 | PG.PG.connect(PG.url,function(e,C,D) { |
62 | if(e) return cb(e); | 62 | if(e) return cb(e); |
63 | var t0=new Date(); | 63 | var t0=new Date(); |
64 | C.query(q,a,function(e,r) { | 64 | C.query(q,a,function(e,r) { |
65 | var t1=new Date(), dt=t1-t0; | 65 | var t1=new Date(), dt=t1-t0; |
66 | D(); | 66 | D(); |
67 | LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount},"SQL query '%s' took %dms",q,dt); | 67 | LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt); |
68 | cb(e,r); | 68 | cb(e,r); |
69 | }); | 69 | }); |
70 | }); | 70 | }); |
71 | }, | 71 | }, |
72 | T: function(cb) { | 72 | T: function(cb) { |
73 | PG.PG.connect(PG.url,function(e,C,D) { | 73 | PG.PG.connect(PG.url,function(e,C,D) { |
74 | if(e) return cb(e); | 74 | if(e) return cb(e); |
75 | C.query('BEGIN',function(e){ | 75 | C.query('BEGIN',function(e){ |
76 | if(e) return D(),cb(e); | 76 | if(e) return D(),cb(e); |
77 | cb(null,{ | 77 | cb(null,{ |
78 | Q: function(q,a,cb) { | 78 | Q: function(q,a,cb) { |
79 | LOGGER.trace({query:q,args:a},'SQL: %s',q); | 79 | LOGGER.trace({query:q,args:a},'SQL: %s',q); |
80 | if(this.over) return cb(new Error('game over')); | 80 | if(this.over) return cb(new Error('game over')); |
81 | if('function'===typeof a) cb=a,a=[]; | 81 | if('function'===typeof a) cb=a,a=[]; |
82 | var t0=new Date(); | 82 | var t0=new Date(); |
83 | C.query(q,a,function(e,r) { | 83 | C.query(q,a,function(e,r) { |
84 | var t1=new Date(), dt=t1-t0; | 84 | var t1=new Date(), dt=t1-t0; |
85 | LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount},"SQL query '%s' took %dms",q,dt); | 85 | LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt); |
86 | cb(e,r); | 86 | cb(e,r); |
87 | }); | 87 | }); |
88 | }, | 88 | }, |
89 | commit: function(cb) { | 89 | commit: function(cb) { |
90 | LOGGER.trace('SQL: commit'); | 90 | LOGGER.trace('SQL: commit'); |
91 | if(this.over) return cb(new Error('game over')); | 91 | if(this.over) return cb(new Error('game over')); |
92 | return (this.over=true),C.query('COMMIT',function(e){D();cb&&cb(e)}); | 92 | return (this.over=true),C.query('COMMIT',function(e){D();cb&&cb(e)}); |
93 | }, | 93 | }, |
94 | rollback: function(cb) { | 94 | rollback: function(cb) { |
95 | LOGGER.trace('SQL: rollback'); | 95 | LOGGER.trace('SQL: rollback'); |
96 | if(this.over) return cb(new Error('game over')); | 96 | if(this.over) return cb(new Error('game over')); |
97 | return (this.over=true),C.query('ROLLBACK',function(e){D();cb&&cb(e)}); | 97 | return (this.over=true),C.query('ROLLBACK',function(e){D();cb&&cb(e)}); |