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

Merge pull request #1536 from rog1121/patch-1

Browse Source 
Add Block ID to logging
This commit is contained in:
Sebastian Grewe 2014-01-23 08:32:45 -08:00
commit 693edccb18
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cronjobs/pplns_payout.php
View File

@ -42,7 +42,7 @@ $count = 0;
foreach ($aAllBlocks as $iIndex => $aBlock) { foreach ($aAllBlocks as $iIndex => $aBlock) {
// If we have unaccounted blocks without share_ids, they might not have been inserted yet // If we have unaccounted blocks without share_ids, they might not have been inserted yet
if (!$aBlock['share_id']) { if (!$aBlock['share_id']) {
$log->logError('E0062: Block has no share_id, not running payouts'); $log->logError('E0062: Block ' . $aBlock['id'] . ' has no share_id, not running payouts');
$monitoring->endCronjob($cron_name, 'E0062', 0, true); $monitoring->endCronjob($cron_name, 'E0062', 0, true);
} }
@ -85,7 +85,7 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
// We need to go one ID lower due to `id >` or we won't match if minimum share ID == $aBlock['share_id'] // We need to go one ID lower due to `id >` or we won't match if minimum share ID == $aBlock['share_id']
$aAccountShares = $share->getSharesForAccounts($iMinimumShareId - 1, $aBlock['share_id']); $aAccountShares = $share->getSharesForAccounts($iMinimumShareId - 1, $aBlock['share_id']);
if (empty($aAccountShares)) { if (empty($aAccountShares)) {
$log->logFatal("No shares found for this block, aborted! Block Height : " . $aBlock['height']); $log->logFatal("No shares found for this block, aborted! Block Height : " . $aBlock['height'] . ', Block ID: ' . $aBlock['id']);
$monitoring->endCronjob($cron_name, 'E0013', 1, true); $monitoring->endCronjob($cron_name, 'E0013', 1, true);
} }
foreach($aAccountShares as $key => $aData) { foreach($aAccountShares as $key => $aData) {
@ -99,7 +99,7 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
// Grab the full current round shares since we didn't match target // Grab the full current round shares since we didn't match target
$aAccountShares = $aRoundAccountShares; $aAccountShares = $aRoundAccountShares;
if (empty($aAccountShares)) { if (empty($aAccountShares)) {
$log->logFatal("No shares found for this block, aborted! Block height: " . $aBlock['height']); $log->logFatal("No shares found for this block, aborted! Block height: " . $aBlock['height'] . ', Block ID:' . $aBlock['id']);
$monitoring->endCronjob($cron_name, 'E0013', 1, true); $monitoring->endCronjob($cron_name, 'E0013', 1, true);
} }
@ -211,15 +211,15 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
// Add new credit transaction // Add new credit transaction
if (!$transaction->addTransaction($aData['id'], $aData['payout'], 'Credit', $aBlock['id'])) if (!$transaction->addTransaction($aData['id'], $aData['payout'], 'Credit', $aBlock['id']))
$log->logFatal('Failed to insert new Credit transaction to database for ' . $aData['username'] . ': ' . $transaction->getCronError()); $log->logFatal('Failed to insert new Credit transaction to database for ' . $aData['username'] . ': ' . $transaction->getCronError() . 'on block ' . $aBlock['id']);
// Add new fee debit for this block // Add new fee debit for this block
if ($aData['fee'] > 0 && $config['fees'] > 0) if ($aData['fee'] > 0 && $config['fees'] > 0)
if (!$transaction->addTransaction($aData['id'], $aData['fee'], 'Fee', $aBlock['id'])) if (!$transaction->addTransaction($aData['id'], $aData['fee'], 'Fee', $aBlock['id']))
$log->logFatal('Failed to insert new Fee transaction to database for ' . $aData['username'] . ': ' . $transaction->getCronError()); $log->logFatal('Failed to insert new Fee transaction to database for ' . $aData['username'] . ': ' . $transaction->getCronError() . 'on block ' . $aBlock['id']);
// Add new donation debit // Add new donation debit
if ($aData['donation'] > 0) if ($aData['donation'] > 0)
if (!$transaction->addTransaction($aData['id'], $aData['donation'], 'Donation', $aBlock['id'])) if (!$transaction->addTransaction($aData['id'], $aData['donation'], 'Donation', $aBlock['id']))
$log->logFatal('Failed to insert new Donation transaction to database for ' . $aData['username'] . ': ' . $transaction->getCronError()); $log->logFatal('Failed to insert new Donation transaction to database for ' . $aData['username'] . ': ' . $transaction->getCronError() . 'on block ' . $aBlock['id']);
} }
// Add full round share statistics // Add full round share statistics
@ -228,7 +228,7 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
continue; continue;
} }
if (!$statistics->insertPPLNSStatistics($aRoundData, $aBlock['id'])) if (!$statistics->insertPPLNSStatistics($aRoundData, $aBlock['id']))
$log->logError('Failed to insert share statistics for ' . $aRoundData['username'] . ': ' . $statistics->getCronError()); $log->logError('Failed to insert share statistics for ' . $aRoundData['username'] . ': ' . $statistics->getCronError() . 'on block ' . $aBlock['id']);
} }
// Store this blocks height as last accounted for // Store this blocks height as last accounted for
@ -236,19 +236,19 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
// Move counted shares to archive before this blockhash upstream share // Move counted shares to archive before this blockhash upstream share
if (!$share->moveArchive($iCurrentUpstreamId, $aBlock['id'], $iPreviousShareId)) if (!$share->moveArchive($iCurrentUpstreamId, $aBlock['id'], $iPreviousShareId))
$log->logError('Failed to copy shares to archive table: ' . $share->getCronError() . ': ' . $share->getCronError()); $log->logError('Failed to copy shares to archive table for block ' . $aBlock['id'] . ': ' . $share->getCronError() . ': ' . $share->getCronError());
// Delete all accounted shares // Delete all accounted shares
if (!$share->deleteAccountedShares($iCurrentUpstreamId, $iPreviousShareId)) { if (!$share->deleteAccountedShares($iCurrentUpstreamId, $iPreviousShareId)) {
$log->logFatal("Failed to delete accounted shares from $iPreviousShareId to $iCurrentUpstreamId, aborting! Error: " . $share->getCronError()); $log->logFatal("Failed to delete accounted shares from $iPreviousShareId to $iCurrentUpstreamId for block ' . $aBlock['id'] . ', aborting! Error: " . $share->getCronError());
$monitoring->endCronjob($cron_name, 'E0016', 1, true); $monitoring->endCronjob($cron_name, 'E0016', 1, true);
} }
// Mark this block as accounted for // Mark this block as accounted for
if (!$block->setAccounted($aBlock['id'])) { if (!$block->setAccounted($aBlock['id'])) {
$log->logFatal("Failed to mark block as accounted! Aborting! Error: " . $block->getCronError()); $log->logFatal("Failed to mark block' . $aBlock['id'] . ' as accounted! Aborting! Error: " . $block->getCronError());
$monitoring->endCronjob($cron_name, 'E0014', 1, true); $monitoring->endCronjob($cron_name, 'E0014', 1, true);
} }
} else { } else {
$log->logFatal('Potential double payout detected. Aborted.'); $log->logFatal('Potential double payout detected for block ' . $aBlock['id'] . '. Aborted.');
$aMailData = array( $aMailData = array(
'email' => $setting->getValue('system_error_email'), 'email' => $setting->getValue('system_error_email'),
'subject' => 'Payout processing aborted', 'subject' => 'Payout processing aborted',