progress

release_version.txt

@@ -1 +1 @@
-0.4.3
+0.4.4

utils/archive_logs.sh

@@ -2,28 +2,33 @@
 
 
 function usage {
-    echo "Usage: ${0}  <log directory>"
+    echo "Usage: ${0}  <log directory> [days (default 2)]"
     exit 1
 }
 
+echo Starting $0 $*
+
 LogDir=${1}
 if [ "${LogDir}" == "" ]
 then
     usage
 fi
 
-echo Starting $0 $*
+Days=${2}
+if [ "${Days}" == "" ]
+then
+    Days=2
+fi
 
-LogArchiveDir=/home/cvtt/prod/archive/logs
-
-# DateCriteria="week ago"
-DateCriteria="2 days ago"
+DateCriteria="${Days} days ago"
 
 Oldest=$(date -d "${DateCriteria}" '+%Y-%m-%d')
-Now=$(date '+%Y%m%d_%H%M%S')
 
 echo "Looking for log files older than ${DateCriteria} in ${LogDir}"
+
+LogArchiveDir=/home/cvtt/prod/archive/logs
 mkdir -p ${LogArchiveDir}
+
 echo "find ${LogDir}/ '(' -name '*.log' -o -name '*.log.*' ')'  -type f -not -newermt ${Oldest})"
 files=$(find ${LogDir}/ '(' -name '*.log' -o -name '*.log.*' ')'  -type f -not -newermt ${Oldest})
 if [ "$files" == "" ]

utils/move_archives.sh

@@ -3,24 +3,34 @@
 # FOR cloud hosts with limited disk space - move to storage server
 
 function usage {
-    echo "Usage: ${0} [<from_dir> default: /home/cvtt/prod/archive)]"
+    echo "Usage: ${0} <host> <from_dir> <days>"
     exit 1
 }
 
+echo Starting $0 $*
+
+
 FromHost=$(hostname -s)
 if [ "${FromHost}" == "" ]
 then
-    echo "Cannot get hostname"
-    exit 1
+    usage
 fi
 
-echo Starting $0 $*
+ArchiveDir=${2}
+if [ "${ArchiveDir}" == "" ]
+then
+    usage
+fi
 
-ArchiveDir=/home/cvtt/prod/archive
-Target=cloudstore.cvtt.vpn:/home/cvtt/Archive/${FromHost}/
+Days=${2}
+if [ "${Days}" == "" ]
+then
+    Days=2
+fi
 
-# DateCriteria="week ago"
-DateCriteria="2 days ago"
+DateCriteria="${Days} days ago"
+
+TargeHost=cloudstore.cvtt.vpn
 
 Oldest=$(date -d "${DateCriteria}" '+%Y-%m-%d')
 Now=$(date '+%Y%m%d_%H%M%S')
@@ -43,7 +53,8 @@ if [ "$files" == "" ]
 then
     echo "No files found older than ${Oldest} in ${LogDir}"
 else
-    echo Archiving files:
+    Target="${TargetHost}:/home/cvtt/Archive/${FromHost}/"
+    echo "Moving files to ${Target}:"
     echo -----------------
     for f in ${files}
     do