Merge 913970f into ff7d425

logrotate-course.conf

@@ -0,0 +1,20 @@
+/s/SUL/Harvester/shared/log/course_harvest.log {
+    rotate 30
+    dateext
+    dateformat .%Y%m%d%H
+    nocompress
+    nomail
+    olddir /s/SUL/Harvester/shared/log
+    create 644 sirsi sirsi
+    ifempty
+}
+/s/SUL/Harvester/shared/out/course_harvest.out {
+    rotate 30
+    dateext
+    dateformat .%Y%m%d%H
+    nocompress
+    nomail
+    olddir /s/SUL/Harvester/shared/out
+    create 644 sirsi sirsi
+    ifempty
+}

logrotate-person.conf

@@ -0,0 +1,50 @@
+/s/SUL/Harvester/shared/out/harvest.out {
+    rotate 30
+    dateext
+    dateformat .%Y%m%d%H
+    nocompress
+    nomail
+    olddir /s/SUL/Harvester/shared/out
+    create 644 sirsi sirsi
+    ifempty
+}
+/s/SUL/Harvester/shared/out/harvest.xml.out {
+    rotate 30
+    dateext
+    dateformat .%Y%m%d%H
+    nocompress
+    nomail
+    olddir /s/SUL/Harvester/shared/out
+    create 644 sirsi sirsi
+    ifempty
+}
+/s/SUL/Harvester/shared/log/harvest.log {
+    rotate 30
+    dateext
+    dateformat .%Y%m%d%H
+    nocompress
+    nomail
+    olddir /s/SUL/Harvester/shared/log
+    create 644 sirsi sirsi
+    ifempty
+}
+/s/SUL/Harvester/shared/log/illiad*.log {
+    rotate 30
+    dateext
+    dateformat .%Y%m%d%H
+    nocompress
+    nomail
+    olddir /s/SUL/Harvester/shared/log
+    create 644 sirsi sirsi
+    ifempty
+}
+/s/SUL/Harvester/shared/log/folio.log {
+    rotate 30
+    dateext
+    dateformat .%Y%m%d%H
+    nocompress
+    nomail
+    olddir /s/SUL/Harvester/shared/log
+    create 644 sirsi sirsi
+    ifempty
+}

run/do-course-harvest.sh

@@ -21,10 +21,8 @@ fi
 
 cat $LOG/course_harvest.log | mailx -s 'Course Harvest Log' sul-unicorn-devs@lists.stanford.edu
 
-mv $LOG/course_harvest.log $LOG/course_harvest.log.$DATE
-mv $OUT/course_harvest.out $OUT/course_harvest.out.$DATE
-
-touch $LOG/course_harvest.log
+# Save and reset output and log files
+/usr/sbin/logrotate --verbose --force $HOME/logrotate-course.conf --state /s/SUL/Harvester/shared/logrotate-state >> $LOG/logrotate.log 2>&1
 
 usage(){
     echo "Usage: $0 [ no argument | 'file' ] [ file of course IDs (if arg0 == file) ] [ DATE (optional: to append to log and out files) ]"

run/do-person-harvest.sh

@@ -50,7 +50,7 @@ cd $FOLIO/lib
 # Split into batches of 5000
 while mapfile -t -n 5000 array && ((${#array[@]}))
 do
-    printf '%s\n' "${array[@]}" > $OUT/tmp.xml
+    printf '%s\n' "${array[@]}" > $OUT/tmp.xml 2>&1
     ruby folio_user.rb $OUT/tmp.xml >> $LOG/folio.log 2>&1
     rm $OUT/tmp.xml
 done < $OUT/harvest.xml.out
@@ -59,18 +59,8 @@ done < $OUT/harvest.xml.out
 cat $LOG/harvest.log | mailx -s 'Harvest Log' sul-unicorn-devs@lists.stanford.edu
 cat $LOG/folio.log | mailx -s 'Folio User Load' sul-unicorn-devs@lists.stanford.edu
 
-# Save output files
-mv $OUT/harvest.out $OUT/harvest.out.$DATE
-mv $OUT/harvest.xml.out $OUT/harvest.xml.out.$DATE
-
-# Save and reset log files
-mv $LOG/harvest.log $LOG/harvest.log.$DATE
-mv $LOG/illiad.log $LOG/illiad.log.$illiad_date.$DATE
-mv $LOG/folio.log $LOG/folio.log.$DATE
-
-touch $LOG/harvest.log
-touch $LOG/illiad.log
-touch $LOG/folio.log
+# Save and reset output and log files
+/usr/sbin/logrotate --verbose --force $HOME/logrotate-person.conf --state /s/SUL/Harvester/shared/logrotate-state >> $LOG/logrotate.log 2>&1
 
 usage(){
     echo "Usage: $0 [ no argument | 'file' ] [ file of user keys (if arg0 == file) ] [ DATE (optional: to append to log and out files) ]"