From 67012bfe2cfb3f5ffc540747dac5d062fc5b7706 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 26 Nov 2014 14:59:47 +0100 Subject: [PATCH] Use YAZ backtrace facility PAZ-983 --- configure.ac | 2 +- debian/control | 2 +- pazpar2.spec | 4 ++-- src/pazpar2.c | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 95defaf..b40a776 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_LANG(C) AC_C_INLINE -YAZ_INIT([static icu],[4.2.68]) +YAZ_INIT([static icu],[5.7.0]) if test -z "$YAZLIB"; then AC_MSG_ERROR([YAZ development libraries missing]) fi diff --git a/debian/control b/debian/control index fc4d014..507358c 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Adam Dickmeiss Build-Depends: debhelper (>= 7), autotools-dev, - libyaz5-dev (>= 5.0.0), + libyaz5-dev (>= 5.7.0), docbook-xsl Standards-Version: 3.7.2 diff --git a/pazpar2.spec b/pazpar2.spec index 5bf759e..1cdd1b5 100644 --- a/pazpar2.spec +++ b/pazpar2.spec @@ -8,11 +8,11 @@ Group: Applications/Internet Vendor: Index Data ApS Source: pazpar2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: libyaz5-devel >= 5.0.0 +BuildRequires: libyaz5-devel >= 5.7.0 Packager: Adam Dickmeiss URL: http://www.indexdata.com/pazpar2 Summary: pazpar2 daemon -Requires: libyaz5 >= 5.0.0 +Requires: libyaz5 >= 5.7.0 Requires: pazpar2-xsl %description diff --git a/src/pazpar2.c b/src/pazpar2.c index 3e8ebaf..478188c 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include // #define MTRACE #ifdef MTRACE @@ -121,6 +122,8 @@ static int sc_main( yaz_log_init_prefix("pazpar2"); yaz_log_xml_errors(0, YLOG_WARN); + yaz_enable_panic_backtrace(argv[0]); + while ((ret = options("dDf:h:l:m:p:R:tu:v:Vw:X", argv, argc, &arg)) != -2) { switch (ret) @@ -221,6 +224,7 @@ static int sc_main( #endif ); } + config = config_create(config_fname); if (!config) return 1; -- 1.7.10.4