Changeset 32753

Timestamp:

2019-02-07T19:12:06+13:00 (5 years ago)

Author:

ak19

Message:

Western Wilson stuff. Automating MacroniserLogFileProcessor setup from the build.xml

Location:

other-projects/the-macronizer/trunk

Files:

• build.xml (modified) (3 diffs)
• src/scripts-and-sql/EXAMPLE_INSERT.sql (moved) (moved from other-projects/the-macronizer/trunk/src/scripts-and-sql/INSERT.sql )
• src/scripts-and-sql/cron.in (modified) (1 diff)
• src/scripts-and-sql/macronLogToDB.bash.in (moved) (moved from other-projects/the-macronizer/trunk/src/scripts-and-sql/macronLogToDB.bash ) (2 diffs)

other-projects/the-macronizer/trunk/build.xml

@@ -19 +19 @@
   <property name="lib.dir.exp"  location="web/WEB-INF/lib" />
   <property name="webinf.dir"  location="web/WEB-INF" />
-  <property name="scripts.dir" location="src/scripts-and-sql" />
+  <!-- Properties for MacroniserLogFileProcessor, use FULL PATHS -->
+  <property name="scripts.dir" location="${basedir}/src/scripts-and-sql" />
+  <property name="logfileproc.dir" value="${basedir}/logproc"/>
   
   <!--
@@ -94 +96 @@
      from the daily macron.log.<date> files to a mysqldb, need to do some setup too -->
     <copy file="${build.dir.exp}/mysql.properties.in" tofile="${build.dir.exp}/WEB-INF/classes/mysql.properties" filtering="true" overwrite="true"/>
-    <chmod file="${scripts.dir}/macronLogToDB.bash" perm="ugo+rx"/>
+    
+    <mkdir dir="${logfileproc.dir}"/>
+    
     <filter token="macronizer.scripts" value="${scripts.dir}"/>
     <filter token="macronizer.logs" value="${build.dir.exp}/logs"/>
     <copy file="${basedir}/src/scripts-and-sql/cron.in" tofile="${basedir}/src/scripts-and-sql/cron.txt" filtering="true" overwrite="true"/>
+
+    <filter token="logfileproc.exec_folder" value="${build.dir.exp}/WEB-INF/classes"/> <!-- where the util.MacroniserLogProcessor compiled code is -->
+    <filter token="logfileproc.dir" value="${logfileproc.dir}"/>
+    <filter token="jarlibs.folder" value="${build.dir.exp}/WEB-INF/lib"/>
+    <filter token="classes.folder" value="${build.dir.exp}/WEB-INF/classes"/>
+    
+    <copy file="${scripts.dir}/macronLogToDB.bash.in" tofile="${scripts.dir}/macronLogToDB.bash" filtering="true" overwrite="true"/>
+    <chmod file="${scripts.dir}/macronLogToDB.bash" perm="ugo+rx"/>
     
     <echo>*** Run the target 'logs-to-db-instructions' for instructions on setting up the MacroniserLogFileProcessor***</echo>
@@ -130 +142 @@
     - type 'crontab -e' and the editor will open the cronfile
     - append the contents from ${scripts.dir}/cron.txt to the cronfile
+    - save file and exit the editor
+
+      5. If you have email rights on the linux you're working from,
+         type your email into macronLogToDB.bash.in and macronLogToDB.bash
+         to get sent emails on errors.
+
+      6. All going well, you should get output files in the ${logfileproc.dir}
+     folder after the cron job runs each night.
     
       ************************************************************

other-projects/the-macronizer/trunk/src/scripts-and-sql/cron.in

@@ -27 +27 @@
 
 ## Stdout goes to the .out file and stderr will go to macronLogToDB..err file
-* 0 * * * @macronizer.scripts@/macronLogToDB.out > @macronizer.logs@/macronLogToDB.out
+* 0 * * * @macronizer.scripts@/macronLogToDB.bash > @logfileproc.dir@/macronLogToDB.out
 

other-projects/the-macronizer/trunk/src/scripts-and-sql/macronLogToDB.bash.in

@@ -2 +2 @@
 
 
-##the working directory, change this if you in diff place
-#file_dir='/home/wjkw1/RESEARCH_2018-19/bash_test/'
+###################################
 
-##names of the files
-#jar_filename='testing_jar.jar'
-#log_filename='loggingtest.log'
+# Set email_address only if you have permissions to run the mail client
+# on your linux box
+[email protected] #[email protected]
 
-##log file and jar file compilation
-#jar_file=$file_dir$jar_filename
-#log_file=$file_dir$log_filename
 
-#echo "Executing... $jar_filename"
-#java -jar $jar_file $log_file
-#echo "Finished executing $jar_filename"
-
-###################################
-macronlogs_folder=/home/wjkw1/comp520/MacroniserLogs/tmp #/home/wjkw1/comp520/MacroniserLogs/logs #/Scratch/wjkw1/macron-restoration/web/logs
 #macronLogToDBjar=
-exec_folder=/home/wjkw1/IdeaProjects/LogFileExtraction/out/production/LogFileExtraction
-processed_folder=/Scratch/wjkw1/processed #/Scratch/wjkw1/macron-restoration/processed
-reprocess_folder=/Scratch/wjkw1/reprocess #/Scratch/wjkw1/macron-restoration/reprocess
-errfile=/Scratch/wjkw1/macronLogToDB.err #/Scratch/wjkw1/macron-restoration/macronLogToDB.err
-e[email protected] #[email protected]
-jars_folder=/Scratch/wjkw1/mysql-connector-java-8.0.14 #/Scratch/wjkw1/macron-restoration/web/WEB-INF/lib
-mysqlprops_folder=/Scratch/wjkw1/classes #/Scratch/wjkw1/macron-restoration/web/WEB-INF/classes
+exec_folder=@logfileproc.exec_folder@ #macronizer/web/classes (containing util.MacroniserLogFileProcessor)
+[email protected]@ #macronizer/web/logs
+[email protected]@/processed #/macronizer/logproc/processed
+[email protected]@/reprocess #/macronizer/logproc/reprocess
+e[email protected]@/macronLogToDB.err #/macronizer/logproc/macronLogToDB.err
+jars_folder=@jarlibs.folder@ #macronizer/web/WEB-INF/lib
+mysqlprops_folder=@classes.folder@ #/macronizer/web/WEB-INF/classes
 
 echo ""
@@ -90 +80 @@
 #done
 
-echo "Finished processing macron.log.* files"
+echo "Finished processing macron.log.* files in $macronlogs_folder"
 echo ""
+
+# if email address provided, attempt to send email
+#if [[ -z "${//$email_address }" ]]; then
 
 # If error file exists and has non-zero size, send email
 # https://stackoverflow.com/questions/30080997/if-file-is-exists-and-is-not-empty-always-gives-me-the-false-value
+
 if [ -s $errfile ] ; then    
     # send email with contents of error file
     echo "cat $errfile | mail -s 'Macron.log to DB cron failure output' $email_address"
     # TODO: uncomment on a machine that's allowed to email
-    #cat $errfile | mail -s 'Macron.log to DB cron failure output' $email_address
-
+    #cat $errfile | mail -s 'Macron.log to DB cron failure output' $email_address       
     
-    #echo "Supposed to have sent MAIL by now."
+    echo "Supposed to have sent MAIL by now to $email_address"
 fi
+#fi