added for the first time

[monitor.git] / automate_pl03.sh

diff --git a/automate_pl03.sh b/automate_pl03.sh
index 82f25dc..32a1a17 100755 (executable)
--- a/automate_pl03.sh
+++ b/automate_pl03.sh
@@ -4,20 +4,29 @@ set -e
 cd $HOME/monitor/
 DATE=`date +%Y-%m-%d-%T`
 
-
 if [ -f $HOME/monitor/SKIP ] ; then 
-       echo "SKIPPING Monitor"
+       #       echo "SKIPPING Monitor"
+       #       exit
        # TODO: should be possible to kill the old version if 
        # desired and prevent lingering instances of automate.
-       #./kill.cmd.sh `cat $HOME/monitor/SKIP`
-       exit
-else
-       echo $$ > $HOME/monitor/SKIP
+       if [ -z "$1" ] ; then 
+               echo "KILLING Monitor"
+               PID=`cat $HOME/monitor/SKIP`
+               rm -f $HOME/monitor/SKIP
+               ./kill.cmd.sh $PID
+       else 
+               # skipping monitor
+               echo "SKIPPING Monitor"
+               exit
+       fi 
 fi
+echo $$ > $HOME/monitor/SKIP
 #########################
 # 1. FINDBAD NODES 
 rm -f pdb/production.findbad2.pkl
-./findbad.py --cachenodes --debug=0 --dbname="findbad2" $DATE
+./findbad.py --increment --cachenodes --debug=0 --dbname="findbad2" $DATE
+
+ps ax | grep BatchMode | grep -v grep | awk '{print $1}' | xargs kill
 
 ########################
 # COPY to golf for diagnose.py and action.py
@@ -37,6 +46,12 @@ cp badcsv.txt /plc/data/var/www/html/monitor/
 # 2. FINDBAD PCUS
 rm -f pdb/production.findbadpcus2.pkl
 ./findbadpcu.py --increment --refresh --debug=0 --dbname=findbadpcus2 $DATE            
+
+./sitebad.py --increment
+
+# clean up stray 'locfg' processes that hang around inappropriately...
+ps ax | grep locfg | grep -v grep | awk '{print $1}' | xargs kill
+
 # convert pkl to php serialize format.
 cp pdb/production.findbadpcus2.pkl pdb/production.findbadpcus.pkl
 ./pkl2php.py -i findbadpcus2 -o findbadpcus
@@ -48,7 +63,7 @@ cp pdb/production.findbadpcus2.pkl pdb/production.findbadpcus.pkl
 ./pkl2php.py -i idTickets -o idTickets
 
 for f in findbad act_all findbadpcus l_plcnodes; do 
-       cp pdb/production.$f.pkl archive-pdb/`date +%F`.production.$f.pkl
+       cp pdb/production.$f.pkl archive-pdb/`date +%F-%H:%M`.production.$f.pkl
 done
 
 rm -f $HOME/monitor/SKIP