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

Merge pull request #1029 from TheSerapher/issue-1021

Browse Source 
Issue 1021
This commit is contained in:
Sebastian Grewe 2013-12-22 00:01:01 -08:00
commit 126dbae525
2 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cronjobs/archive_cleanup.php
View File

@ -26,9 +26,11 @@ chdir(dirname(__FILE__));
require_once('shared.inc.php'); require_once('shared.inc.php');
// If we don't keep archives, delete some now to release disk space // If we don't keep archives, delete some now to release disk space
if (!$share->purgeArchive()) { if (!$affected_rows = $share->purgeArchive()) {
$log->logError("Failed to delete archived shares, not critical but should be checked: " . $share->getCronError()); $log->logError("Failed to delete archived shares, not critical but should be checked: " . $share->getCronError());
$monitoring->endCronjob($cron_name, 'E0008', 1, true); $monitoring->endCronjob($cron_name, 'E0008', 1, true);
} else {
$log->logDebug("Deleted $affected_rows archived shares this run");
} }
// Cron cleanup and monitoring // Cron cleanup and monitoring

63
public/include/classes/share.class.php
View File

@ -172,50 +172,31 @@ class Share Extends Base {
**/ **/
public function purgeArchive() { public function purgeArchive() {
// Fallbacks if unset // Fallbacks if unset
if (!isset($this->config['purge']['shares'])) $this->config['purge']['shares'] = 25000; if (!isset($this->config['archive']['purge'])) $this->config['archive']['purge'] = 5;
if (!isset($this->config['purge']['sleep'])) $this->config['purge']['sleep'] = 1;
// TODO: This could need some cleanup work somtime but works $stmt = $this->mysqli->prepare("SELECT CEIL(COUNT(id) / 100 * ?) AS count FROM $this->tableArchive");
if ($this->config['payout_system'] == 'pplns') { if ($this->checkStmt($stmt) && $stmt->bind_param('i', $this->config['archive']['purge']) && $stmt->execute() && $result = $stmt->get_result()) {
// Fetch our last block so we can go back configured rounds $limit = $result->fetch_object()->count;
$aLastBlock = $this->block->getLast();
// Fetch the block we need to find the share_id
$aBlock = $this->block->getBlock($aLastBlock['height'] - $this->config['archive']['maxrounds']);
// We need to find a hard limit id so we don't run into an infinite loop, skip process if we can't find a limit
$stmt = $this->mysqli->prepare("SELECT MAX(id) AS id FROM $this->tableArchive WHERE block_id < ? AND time < DATE_SUB(now(), INTERVAL ? MINUTE)");
if ($this->checkStmt($stmt) && $stmt->bind_param('ii', $aBlock['id'], $this->config['archive']['maxage']) && $stmt->execute() && $result = $stmt->get_result())
if ( ! $max_id = $result->fetch_object()->id ) return true;
// Now that we know our block, remove those shares
$affected = 1;
while ($affected > 0) {
// Sleep first to allow any IO to cleanup
sleep($this->config['purge']['sleep']);
$stmt = $this->mysqli->prepare("DELETE FROM $this->tableArchive WHERE block_id < ? AND time < DATE_SUB(now(), INTERVAL ? MINUTE) AND id <= ? LIMIT " . $this->config['purge']['shares']);
if ($this->checkStmt($stmt) && $stmt->bind_param('iii', $aBlock['id'], $this->config['archive']['maxage'], $max_id) && $stmt->execute()) {
$affected = $stmt->affected_rows;
} else {
return $this->sqlError();
}
}
} else { } else {
// We need to find a hard limit id so we don't run into an infinite loop, skip process if we can't find a limit return $this->sqlError();
$stmt = $this->mysqli->prepare("SELECT MAX(id) AS id FROM $this->tableArchive WHERE time < DATE_SUB(now(), INTERVAL ? MINUTE)");
if ($this->checkStmt($stmt) && $stmt->bind_param('i', $this->config['archive']['maxage']) && $stmt->execute() && $result = $stmt->get_result())
if ( ! $max_id = $result->fetch_object()->id ) return true;
$affected = 1;
while ($affected > 0) {
// Sleep first to allow any IO to cleanup
sleep($this->config['purge']['sleep']);
$stmt = $this->mysqli->prepare("DELETE FROM $this->tableArchive WHERE time < DATE_SUB(now(), INTERVAL ? MINUTE) AND id <= ? LIMIT " . $this->config['purge']['shares']);
if ($this->checkStmt($stmt) && $stmt->bind_param('ii', $this->config['archive']['maxage'], $max_id) && $stmt->execute()) {
$affected = $stmt->affected_rows;
} else {
return $this->sqlError();
}
}
} }
return true; $stmt->close();
$stmt = $this->mysqli->prepare("
DELETE FROM $this->tableArchive WHERE time < (
SELECT MIN(time) FROM (
SELECT MIN(time) AS time
FROM $this->tableArchive
WHERE block_id = (
SELECT MIN(id) AS minid FROM (
SELECT id FROM " . $this->block->getTableName() . " ORDER BY height DESC LIMIT ?
) AS minheight
) UNION SELECT DATE_SUB(now(), INTERVAL ? MINUTE) AS time
) AS mintime
) LIMIT $limit
");
if ($this->checkStmt($stmt) && $stmt->bind_param('ii', $this->config['archive']['maxrounds'], $this->config['archive']['maxage']) && $stmt->execute())
return $stmt->affected_rows;
return $this->sqlError();
} }
/** /**