Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next
This commit is contained in:
commit
6f1f3225e1
@ -95,7 +95,7 @@ if (empty($aAllBlocks)) {
|
|||||||
// Fetch our offending block
|
// Fetch our offending block
|
||||||
$aBlockError = $block->getBlockByShareId($iPreviousShareId);
|
$aBlockError = $block->getBlockByShareId($iPreviousShareId);
|
||||||
$log->logError('E0001: The block with height ' . $aBlock['height'] . ' found share ' . $iCurrentUpstreamId . ' which is < than ' . $iPreviousShareId . ' of block ' . $aBlockError['height'] . '.');
|
$log->logError('E0001: The block with height ' . $aBlock['height'] . ' found share ' . $iCurrentUpstreamId . ' which is < than ' . $iPreviousShareId . ' of block ' . $aBlockError['height'] . '.');
|
||||||
if ( !$aShareError = $share->getShareById($aBlockError['share_id']) || !$aShareCurrent = $share->getShareById($iCurrentUpstreamId)) {
|
if ( !($aShareError = $share->getShareById($aBlockError['share_id'])) || !($aShareCurrent = $share->getShareById($iCurrentUpstreamId))) {
|
||||||
// We were not able to fetch all shares that were causing this detection to trigger, bail out
|
// We were not able to fetch all shares that were causing this detection to trigger, bail out
|
||||||
$log->logFatal('E0002: Failed to fetch both offending shares ' . $iCurrentUpstreamId . ' and ' . $iPreviousShareId . '. Block height: ' . $aBlock['height']);
|
$log->logFatal('E0002: Failed to fetch both offending shares ' . $iCurrentUpstreamId . ' and ' . $iPreviousShareId . '. Block height: ' . $aBlock['height']);
|
||||||
$monitoring->endCronjob($cron_name, 'E0002', 1, true);
|
$monitoring->endCronjob($cron_name, 'E0002', 1, true);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user