X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=automate-default.sh;h=9f0f9d175c8bc1dc767e0b3f546330c9e63b49f7;hp=8d300a7c0d4b9537bba3063eb417554107007c34;hb=0e3cb254ed858745809d57de80437d73aedc6eba;hpb=2d1c0c5c0bf2fb15651dcfd813ae68bff4b80535 diff --git a/automate-default.sh b/automate-default.sh index 8d300a7..9f0f9d1 100755 --- a/automate-default.sh +++ b/automate-default.sh @@ -74,10 +74,11 @@ ps ax | grep BatchMode | grep -v grep | awk '{print $1}' | xargs -r kill || : # clean up stray 'locfg' processes that hang around inappropriately... ps ax | grep locfg | grep -v grep | awk '{print $1}' | xargs -r kill || : -${MONITOR_SCRIPT_ROOT}/policy.py $DATE -#${MONITOR_SCRIPT_ROOT}/checksync.py $DATE || : -service plc restart monitor -curl -s 'http://summer.cs.princeton.edu/status/tabulator.cgi?table=table_nodeview&formatcsv' > /var/lib/monitor/comon/$DATE.comon.csv + +${MONITOR_SCRIPT_ROOT}/policy.py $DATE || : +${MONITOR_SCRIPT_ROOT}/statistics/add-record.py || : +curl -s 'http://summer.cs.princeton.edu/status/tabulator.cgi?table=table_nodeview&formatcsv' > /var/lib/monitor/comon/$DATE.comon.csv || : cp ${MONITOR_SCRIPT_ROOT}/monitor.log ${MONITOR_ARCHIVE_ROOT}/`date +%F-%H:%M`.monitor.log +service plc restart monitor || : rm -f $MONITOR_PID