diff --git a/build.xml b/build.xml index 9dac1e174f61669d64bee3bf11d861b74886869d..f4c5cd96df674ea38e7fcd0bbebc192b4f71d2c1 100644 --- a/build.xml +++ b/build.xml @@ -170,7 +170,7 @@ <exec command="PGPASSWORD=${vufinddbpass} psql -U ${vufinddbuser} -f ${srcdir}/module/VuFind/sql/pgsql.sql ${vufinddb}" checkreturn="true" /> <!-- configure VuFind --> - <exec command="sed -e "s!mysql://root@localhost/vufind!pgsql://${vufinddbuser}:${vufinddbpass}@${pgsqlhost}/${vufinddb}!" ${srcdir}/config/vufind/config.ini > ${srcdir}/local/config/vufind/config.ini" /> + <exec command="sed -e "s!mysql://root@localhost/vufind!pgsql://${vufinddbuser}:${vufinddbpass}@${pgsqlhost}/${vufinddb}!" ${srcdir}/config/vufind/config.ini > ${srcdir}/local/config/vufind/config.ini.tmp" /> </then> <else> <!-- build database --> @@ -181,10 +181,16 @@ <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -D ${vufinddb} < ${srcdir}/module/VuFind/sql/mysql.sql" checkreturn="true" /> <!-- configure VuFind --> - <exec command="sed -e "s!mysql://root@localhost/vufind!mysql://${vufinddbuser}:${vufinddbpass}@${mysqlhost}/${vufinddb}!" ${srcdir}/config/vufind/config.ini > ${srcdir}/local/config/vufind/config.ini" /> + <exec command="sed -e "s!mysql://root@localhost/vufind!mysql://${vufinddbuser}:${vufinddbpass}@${mysqlhost}/${vufinddb}!" ${srcdir}/config/vufind/config.ini > ${srcdir}/local/config/vufind/config.ini.tmp" /> </else> </if> + <!-- Turn on exception logging --> + <exec command="sed -e "s!;file = /var/log/vufind.log:alert,error,notice,debug!file = ${srcdir}/vufind-exception.log:alert-5,error-5!" ${srcdir}/local/config/vufind/config.ini.tmp > ${srcdir}/local/config/vufind/config.ini" /> + <delete file="${srcdir}/local/config/vufind/config.ini.tmp" /> + <exec command="touch ${srcdir}/vufind-exception.log" /> + <exec command="chmod a+w ${srcdir}/vufind-exception.log" /> + <!-- start Solr (use restart in case of old PID files) --> <exec command="VUFIND_HOME=${srcdir} VUFIND_LOCAL_DIR=${srcdir}/local JETTY_PID=${srcdir}/local/vufindtest.pid JETTY_CONSOLE=/dev/null ${srcdir}/vufind.sh restart" outputProperty="LASTOUTPUT" /> <echo message="${LASTOUTPUT}" /> @@ -263,6 +269,7 @@ <delete file="${srcdir}/import/solrmarc.log" failonerror="true" /> <delete file="${srcdir}/composer.lock" failonerror="false" /> <delete file="${srcdir}/composer.phar" failonerror="false" /> + <delete file="${srcdir}/vufind-exception.log" failonerror="false" /> <delete dir="${srcdir}/vendor" includeemptydirs="true" failonerror="false" /> <delete dir="${srcdir}/local" includeemptydirs="true" failonerror="true" /> <exec command="git reset --hard" />