From 00b3c45d2a8e2a983943de3d45d193b7d8f47eb0 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Tue, 9 Jul 2013 14:12:54 +0200
Subject: [PATCH] Adding archive cleanup cron

Since this needs to be done for all payouts, moved into it's own cron.

* Adjusted run-crons.sh to trigger archive cleanup
* Adjusted payouts to remove purgeArchive calls
* Adjusted pps payout, removed old configuration variable

Further addresses #143
---
 cronjobs/archive_cleanup.php | 29 +++++++++++++++++++++++++++++
 cronjobs/pplns_payout.php    |  4 ----
 cronjobs/pps_payout.php      |  2 +-
 cronjobs/run-crons.sh        |  2 +-
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100755 cronjobs/archive_cleanup.php

diff --git a/cronjobs/archive_cleanup.php b/cronjobs/archive_cleanup.php
new file mode 100755
index 00000000..6f008d69
--- /dev/null
+++ b/cronjobs/archive_cleanup.php
@@ -0,0 +1,29 @@
+#!/usr/bin/php
+<?php
+
+/*
+
+Copyright:: 2013, Sebastian Grewe
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ */
+
+// Include all settings and classes
+require_once('shared.inc.php');
+
+// If we don't keep archives, delete some now to release disk space
+if (!$share->purgeArchive()) {
+  $log->logError("Failed to delete archived shares, not critical but should be checked!");
+}
+?>
diff --git a/cronjobs/pplns_payout.php b/cronjobs/pplns_payout.php
index 827b598c..54c229bd 100755
--- a/cronjobs/pplns_payout.php
+++ b/cronjobs/pplns_payout.php
@@ -160,10 +160,6 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
       $log->logFatal("Failed to delete accounted shares from $iPreviousShareId to $iCurrentUpstreamId, aborting!");
       exit(1);
     }
-    // If we don't keep archives, delete some now to release disk space
-    if (!$share->purgeArchive()) {
-      $log->logError("Failed to delete archived shares, not critical but should be checked!");
-    }
     // Mark this block as accounted for
     if (!$block->setAccounted($aBlock['id'])) {
       $log->logFatal("Failed to mark block as accounted! Aborting!");
diff --git a/cronjobs/pps_payout.php b/cronjobs/pps_payout.php
index ee35e2ad..58b8dc83 100755
--- a/cronjobs/pps_payout.php
+++ b/cronjobs/pps_payout.php
@@ -120,7 +120,7 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
       $log->logError("Failed to update stats for this block on : " . $aData['username']);
   }
   // Move shares to archive
-  if ($config['archive_shares'] && $aBlock['share_id'] < $iLastShareId) {
+  if ($aBlock['share_id'] < $iLastShareId) {
     if (!$share->moveArchive($aBlock['share_id'], $aBlock['id'], @$iLastBlockShare))
       $log->logError("Archving failed");
   }
diff --git a/cronjobs/run-crons.sh b/cronjobs/run-crons.sh
index b6b241b4..e797cb44 100755
--- a/cronjobs/run-crons.sh
+++ b/cronjobs/run-crons.sh
@@ -16,7 +16,7 @@ PIDFILE='/tmp/mmcfe-ng-cron.pid'
 CRONHOME='.'
 
 # List of cruns to execute
-CRONS="findblock.php proportional_payout.php pplns_payout.php pps_payout.php blockupdate.php auto_payout.php tickerupdate.php notifications.php statistics.php"
+CRONS="findblock.php proportional_payout.php pplns_payout.php pps_payout.php blockupdate.php auto_payout.php tickerupdate.php notifications.php statistics.php archive_cleanup.php"
 
 # Additional arguments to pass to cronjobs
 CRONARGS="-v"