RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Catch jsonRPC exceptions

Browse Source 
Fixes #1339 once merged.
This commit is contained in:
Sebastian Grewe 2014-01-10 16:20:24 +01:00
parent 2ae3357b23
commit 627b7a17ff
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cronjobs/payouts.php
View File

@ -61,13 +61,13 @@ if ($setting->getValue('disable_manual_payouts') != 1) {
$log->logError('Failed to verify this users coin address, skipping payout'); $log->logError('Failed to verify this users coin address, skipping payout');
continue; continue;
} }
} catch (BitcoinClientException $e) { } catch (Exception $e) {
$log->logError('Failed to verify this users coin address, skipping payout'); $log->logError('Failed to verify this users coin address, skipping payout');
continue; continue;
} }
try { try {
$txid = $bitcoin->sendtoaddress($aData['coin_address'], $dBalance - $config['txfee']); $txid = $bitcoin->sendtoaddress($aData['coin_address'], $dBalance - $config['txfee']);
} catch (BitcoinClientException $e) { } catch (Exception $e) {
$log->logError('Failed to send requested balance to coin address, please check payout process. Does the wallet cover the amount?'); $log->logError('Failed to send requested balance to coin address, please check payout process. Does the wallet cover the amount?');
continue; continue;
} }
@ -123,7 +123,7 @@ if ($setting->getValue('disable_auto_payouts') != 1) {
$log->logError('Failed to verify this users coin address, skipping payout'); $log->logError('Failed to verify this users coin address, skipping payout');
continue; continue;
} }
} catch (BitcoinClientException $e) { } catch (Exception $e) {
$log->logError('Failed to verify this users coin address, skipping payout'); $log->logError('Failed to verify this users coin address, skipping payout');
continue; continue;
} }
@ -131,7 +131,7 @@ if ($setting->getValue('disable_auto_payouts') != 1) {
// Send balance, fees are reduced later by RPC Server // Send balance, fees are reduced later by RPC Server
try { try {
$txid = $bitcoin->sendtoaddress($aUserData['coin_address'], $dBalance - $config['txfee']); $txid = $bitcoin->sendtoaddress($aUserData['coin_address'], $dBalance - $config['txfee']);
} catch (BitcoinClientException $e) { } catch (Exception $e) {
$log->logError('Failed to send requested balance to coin address, please check payout process. Does the wallet cover the amount?'); $log->logError('Failed to send requested balance to coin address, please check payout process. Does the wallet cover the amount?');
continue; continue;
} }

2
public/include/classes/bitcoin.class.php
View File

@ -313,7 +313,7 @@ class BitcoinClient extends jsonRPCClient {
public function can_connect() { public function can_connect() {
try { try {
$r = $this->getinfo(); $r = $this->getinfo();
} catch (BitcoinClientException $e) { } catch (Exception $e) {
return $e->getMessage(); return $e->getMessage();
} }
return true; return true;

2
public/include/classes/user.class.php
View File

@ -332,7 +332,7 @@ class User extends Base {
$this->setErrorMessage('Invalid coin address'); $this->setErrorMessage('Invalid coin address');
return false; return false;
} }
} catch (BitcoinClientException $e) { } catch (Exception $e) {
$this->setErrorMessage('Unable to verify coin address'); $this->setErrorMessage('Unable to verify coin address');
return false; return false;
} }

2
public/include/jsonRPCClient.php
View File

@ -129,7 +129,7 @@ class jsonRPCClient {
'content' => $request 'content' => $request
)); ));
$context = stream_context_create($opts); $context = stream_context_create($opts);
if ($fp = fopen($this->url, 'r', false, $context)) { if ($fp = @fopen($this->url, 'r', false, $context)) {
$response = ''; $response = '';
while($row = fgets($fp)) { while($row = fgets($fp)) {
$response.= trim($row)."\n"; $response.= trim($row)."\n";