fix cleanup crash

rodneymo · Sep 4, 2017 · b69547e · b69547e
1 parent f91be0c
commit b69547e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/cleanup.sh b/cleanup.sh
@@ -4,6 +4,7 @@ BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $BASE_DIR
 
 . ${BASE_DIR}/conf/rig-monitor.conf
+. ${BASE_DIR}/utils/functions
 
 # epoch TIME
 _TIME=`date +%s`
@@ -44,6 +45,7 @@ if [ "$POOL_NAME" == "ETHERMINE" ]; then
 	EXPIRED_ETHERMINE_PAYOUTS_SQL="DELETE FROM ethermine_payouts WHERE UNIX_TIMESTAMP(paidon) < ${EXPIRED_DATA};"
 	echo "SQL TO REMOVE EXPIRED ETHERMINE PAYOUTS DATA: $EXPIRED_ETHERMINE_PAYOUTS_SQL"
 	echo $EXPIRED_ETHERMINE_PAYOUTS_SQL | mysql -v -v -u ${GRAFANA_DB_USER} -p${GRAFANA_DB_PWD}  --local-infile rigdata
+fi
 
 #archive old status and info files
 while (( LAST_CLEANUP < TIME )); do

diff --git a/utils/functions b/utils/functions
@@ -1,10 +1,11 @@
 bookkeeping () {
+	RESET_DATE=`date --date="-1 month" +%s`
         if [ ! -f ${RECORD_LOG} ]; then
                 touch ${RECORD_LOG}
-                echo "LAST_INGESTED_CLAYMORE_STATUS=0" >> ${RECORD_LOG}
-                echo "LAST_INGESTED_ETHERMINE_PAYOUTS=0" >> ${RECORD_LOG}
-                echo "LAST_INGESTED_ETHERMINE_STATS=0" >> ${RECORD_LOG}
-                echo "LAST_CLEANUP=0" >> ${RECORD_LOG}
+                echo "LAST_INGESTED_CLAYMORE_STATUS=RESET_DATE" >> ${RECORD_LOG}
+                echo "LAST_INGESTED_ETHERMINE_PAYOUTS=RESET_DATE" >> ${RECORD_LOG}
+                echo "LAST_INGESTED_ETHERMINE_STATS=RESET_DATE" >> ${RECORD_LOG}
+                echo "LAST_CLEANUP=RESET_DATE" >> ${RECORD_LOG}
         fi      
 
         # read to associative array