Merge pull request #511 from chjj/fix_paypro_example

paypro: fix example server for no-tx argument.
This commit is contained in:
Ryan X. Charles 2014-09-16 10:37:04 -07:00
commit 0dd078a280
1 changed files with 31 additions and 30 deletions

View File

@ -299,6 +299,7 @@ app.post('/-/pay', function(req, res, next) {
return ptx;
});
if (!argv['no-tx']) {
(function retry() {
var timeout = setTimeout(function() {
if (conn) {
@ -308,20 +309,18 @@ app.post('/-/pay', function(req, res, next) {
print('Sending transaction with txid: %s', id);
print(tx.getStandardizedObject());
print('Broadcasting transaction...');
var pending = 1;
peerman.on('ack', function listener() {
if (!--pending) {
peerman.removeListener('ack', listener);
clearTimeout(timeout);
print('Transaction sent to peer successfully.');
res.send(ack);
}
});
print('Broadcasting transaction...');
if (!argv['no-tx']) {
conn.sendTx(tx);
}
});
} else {
print('No BTC network connection. Retrying...');
@ -330,8 +329,10 @@ app.post('/-/pay', function(req, res, next) {
}
}, 1000);
})();
} else {
print('Broadcasting transaction...');
res.send(ack);
}
});
/**