From 847c1283b6dced37895f80f352599e66b8727c2e Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Tue, 3 Dec 2013 16:21:59 +0100
Subject: [PATCH] [CHANGE] Adjusted purge defaults

---
 public/include/classes/share.class.php    | 9 +++++----
 public/include/config/global.inc.dist.php | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/public/include/classes/share.class.php b/public/include/classes/share.class.php
index 6ee1c30c..5af52897 100644
--- a/public/include/classes/share.class.php
+++ b/public/include/classes/share.class.php
@@ -172,8 +172,8 @@ class Share Extends Base {
    **/
   public function purgeArchive() {
     // Fallbacks if unset
-    if (!isset($this->config['purge']['shares'])) $this->config['purge']['shares'] = 500000;
-    if (!isset($this->config['purge']['sleep'])) $this->config['purge']['sleep'] = 5;
+    if (!isset($this->config['purge']['shares'])) $this->config['purge']['shares'] = 25000;
+    if (!isset($this->config['purge']['sleep'])) $this->config['purge']['sleep'] = 1;
 
     if ($this->config['payout_system'] == 'pplns') {
       // Fetch our last block so we can go back configured rounds
@@ -246,14 +246,15 @@ class Share Extends Base {
    **/
   public function deleteAccountedShares($current_upstream, $previous_upstream=0) {
     // Fallbacks if unset
-    if (!isset($this->config['purge']['shares'])) $this->config['purge']['shares'] = 500000;
-    if (!isset($this->config['purge']['sleep'])) $this->config['purge']['sleep'] = 5;
+    if (!isset($this->config['purge']['shares'])) $this->config['purge']['shares'] = 25000;
+    if (!isset($this->config['purge']['sleep'])) $this->config['purge']['sleep'] = 1;
 
     $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->table WHERE id > ? AND id <= ? LIMIT " . $this->config['purge']['shares']);
+      $start = microtime(true);
       if ($this->checkStmt($stmt) && $stmt->bind_param('ii', $previous_upstream, $current_upstream) && $stmt->execute()) {
         $affected = $stmt->affected_rows;
       } else {
diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php
index 73028fc9..780ec62d 100644
--- a/public/include/config/global.inc.dist.php
+++ b/public/include/config/global.inc.dist.php
@@ -241,8 +241,8 @@ $config['payout_system'] = 'prop';
  *   sleep   :  5 seconds
  *   shares  :  500000
  **/
-$config['purge']['sleep'] = 5;
-$config['purge']['shares'] = 500000;
+$config['purge']['sleep'] = 1;
+$config['purge']['shares'] = 25000;
 
 /**
  * Archiving configuration for debugging