summaryrefslogtreecommitdiff
path: root/backend
authorMichael Krelin <hacker@klever.net>2013-11-27 17:11:49 (UTC)
committer Michael Krelin <hacker@klever.net>2013-11-27 17:11:49 (UTC)
commit6cd9e34b5b49473923190a6a70c436908c98505e (patch) (unidiff)
treed6182625f7406f8b8facb71166c5e4a607dd2c65 /backend
parent0f1cc2ac41835ee8fa5dded1593fa95092b54bbe (diff)
downloadclipperz-6cd9e34b5b49473923190a6a70c436908c98505e.zip
clipperz-6cd9e34b5b49473923190a6a70c436908c98505e.tar.gz
clipperz-6cd9e34b5b49473923190a6a70c436908c98505e.tar.bz2
more tracelogging
Diffstat (limited to 'backend') (more/less context) (ignore whitespace changes)
-rw-r--r--backend/node/src/clipperz.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js
index b8b4d3e..04b054a 100644
--- a/backend/node/src/clipperz.js
+++ b/backend/node/src/clipperz.js
@@ -31,96 +31,97 @@ function clipperz_store(PG) {
31 }); 31 });
32 }; 32 };
33 rv.prototype.destroy = function(sid,cb) { PG.Q( 33 rv.prototype.destroy = function(sid,cb) { PG.Q(
34 "DELETE FROM clipperz.thesession WHERE s_id=$1",[sid],cb 34 "DELETE FROM clipperz.thesession WHERE s_id=$1",[sid],cb
35 ) }; 35 ) };
36 rv.prototype.length = function(cb) { PG.Q( 36 rv.prototype.length = function(cb) { PG.Q(
37 "SELECT count(*) AS c FROM clipperz.thesession", function(e,r) { 37 "SELECT count(*) AS c FROM clipperz.thesession", function(e,r) {
38 cb(e,e?null:r.rows[0].c); 38 cb(e,e?null:r.rows[0].c);
39 } 39 }
40 ) }; 40 ) };
41 rv.prototype.length = function(cb) { PQ.Q( 41 rv.prototype.length = function(cb) { PQ.Q(
42 "DELETE FROM clipperz.thesession", cb 42 "DELETE FROM clipperz.thesession", cb
43 ) }; 43 ) };
44 rv.prototype.__proto__ = express_store.prototype; 44 rv.prototype.__proto__ = express_store.prototype;
45 return rv; 45 return rv;
46} 46}
47 47
48var srp_g = BIGNUM(2); 48var srp_g = BIGNUM(2);
49var srp_n = BIGNUM("115b8b692e0e045692cf280b436735c77a5a9e8a9e7ed56c965f87db5b2a2ece3",16); 49var srp_n = BIGNUM("115b8b692e0e045692cf280b436735c77a5a9e8a9e7ed56c965f87db5b2a2ece3",16);
50var n123 = '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00'; 50var n123 = '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00';
51 51
52 52
53var CLIPPERZ = module.exports = function(CONFIG) { 53var CLIPPERZ = module.exports = function(CONFIG) {
54 54
55 var LOGGER = CONFIG.logger||{trace:function(){}}; 55 var LOGGER = CONFIG.logger||{trace:function(){}};
56 56
57 var PG = { 57 var PG = {
58 url: CONFIG.psql, 58 url: CONFIG.psql,
59 PG: require('pg').native, 59 PG: require('pg').native,
60 Q: function(q,a,cb) { 60 Q: function(q,a,cb) {
61 if('function'===typeof a) cb=a,a=[]; 61 if('function'===typeof a) cb=a,a=[];
62 LOGGER.trace({query:q,args:a},'SQL: %s',q); 62 LOGGER.trace({query:q,args:a},'SQL: %s',q);
63 PG.PG.connect(PG.url,function(e,C,D) { 63 PG.PG.connect(PG.url,function(e,C,D) {
64 if(e) return cb(e); 64 if(e) return cb(e);
65 var t0=new Date(); 65 var t0=new Date();
66 C.query(q,a,function(e,r) { 66 C.query(q,a,function(e,r) {
67 var t1=new Date(), dt=t1-t0; 67 var t1=new Date(), dt=t1-t0;
68 D(); 68 D();
69 LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt); 69 LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt);
70 cb(e,r); 70 cb(e,r);
71 }); 71 });
72 }); 72 });
73 }, 73 },
74 T: function(cb) { 74 T: function(cb) {
75 PG.PG.connect(PG.url,function(e,C,D) { 75 PG.PG.connect(PG.url,function(e,C,D) {
76 if(e) return cb(e); 76 if(e) return cb(e);
77 C.query('BEGIN',function(e){ 77 C.query('BEGIN',function(e){
78 if(e) return D(),cb(e); 78 if(e) return D(),cb(e);
79 LOGGER.trace('SQL: transaction begun');
79 cb(null,{ 80 cb(null,{
80 Q: function(q,a,cb) { 81 Q: function(q,a,cb) {
81 LOGGER.trace({query:q,args:a},'SQL: %s',q); 82 LOGGER.trace({query:q,args:a},'SQL: %s',q);
82 if(this.over) return cb(new Error('game over')); 83 if(this.over) return cb(new Error('game over'));
83 if('function'===typeof a) cb=a,a=[]; 84 if('function'===typeof a) cb=a,a=[];
84 var t0=new Date(); 85 var t0=new Date();
85 C.query(q,a,function(e,r) { 86 C.query(q,a,function(e,r) {
86 var t1=new Date(), dt=t1-t0; 87 var t1=new Date(), dt=t1-t0;
87 LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt); 88 LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt);
88 cb(e,r); 89 cb(e,r);
89 }); 90 });
90 }, 91 },
91 commit: function(cb) { 92 commit: function(cb) {
92 LOGGER.trace('SQL: commit'); 93 LOGGER.trace('SQL: commit');
93 if(this.over) return cb(new Error('game over')); 94 if(this.over) return cb(new Error('game over'));
94 return (this.over=true),C.query('COMMIT',function(e){D();cb&&cb(e)}); 95 return (this.over=true),C.query('COMMIT',function(e){D();cb&&cb(e)});
95 }, 96 },
96 rollback: function(cb) { 97 rollback: function(cb) {
97 LOGGER.trace('SQL: rollback'); 98 LOGGER.trace('SQL: rollback');
98 if(this.over) return cb(new Error('game over')); 99 if(this.over) return cb(new Error('game over'));
99 return (this.over=true),C.query('ROLLBACK',function(e){D();cb&&cb(e)}); 100 return (this.over=true),C.query('ROLLBACK',function(e){D();cb&&cb(e)});
100 }, 101 },
101 end: function(e,cb) { 102 end: function(e,cb) {
102 if(e) return LOGGER.trace(e,"rolling back transaction due to an error"),this.rollback(cb); 103 if(e) return LOGGER.trace(e,"rolling back transaction due to an error"),this.rollback(cb);
103 this.commit(cb); 104 this.commit(cb);
104 } 105 }
105 }); 106 });
106 }); 107 });
107 }); 108 });
108 } 109 }
109 }; 110 };
110 111
111 112
112 var rv = { 113 var rv = {
113 114
114 json: function clipperz_json(req,res,cb) { 115 json: function clipperz_json(req,res,cb) {
115 var method = req.body.method, pp = JSON.parse(req.body.parameters).parameters; 116 var method = req.body.method, pp = JSON.parse(req.body.parameters).parameters;
116 var message = pp.message; 117 var message = pp.message;
117 var ppp = pp.parameters; 118 var ppp = pp.parameters;
118 res.res = function(o) { return res.json({result:o}) }; 119 res.res = function(o) { return res.json({result:o}) };
119 LOGGER.trace({method:method,parameters:pp},"JSON request"); 120 LOGGER.trace({method:method,parameters:pp},"JSON request");
120 121
121 switch(method) { 122 switch(method) {
122 case 'registration': 123 case 'registration':
123 switch(message) { 124 switch(message) {
124 case 'completeRegistration': return PG.Q( 125 case 'completeRegistration': return PG.Q(
125 "INSERT INTO clipperz.theuser" 126 "INSERT INTO clipperz.theuser"
126 +" (u_name, u_srp_s,u_srp_v, u_authversion,u_header,u_statistics,u_version,u_lock)" 127 +" (u_name, u_srp_s,u_srp_v, u_authversion,u_header,u_statistics,u_version,u_lock)"