Merge branch 'unidata_14.4.1' of github.com:Unidata/awips2 into unidata_14.4.1

Former-commit-id: d8ad6527ea
Former-commit-id: 00d2865571
This commit is contained in:
mjames-upc 2015-09-07 10:52:50 -06:00
commit f85a1261ec

View file

@ -206,7 +206,6 @@ grabCurrentDatabaseQueries() {
t1=`date "+%Y%m%d %H:%M:%S"`
echo "${t1}: Capturing current database queries" >> $processFile
out_file="${dataPath}/database_queries.log"
echo "localhost:5432:metadata:awips:awips" > ~/.pgpass; chmod 600 ~/.pgpass
psql -d metadata -U awips -h ${DATABASE_HOST} -c "select datname, pid, client_addr, query, now()-xact_start as runningTime from pg_stat_activity where state != 'idle' order by runningTime desc;" >> $out_file 2>&1 &
fi
}
@ -760,7 +759,6 @@ fi
zenity --info --no-wrap --title="Capture Done" --text="$message" > /dev/null 2>&1 &
echo
echo $message
rm ~/.pgpass
cd $curDir