projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use YAZ backtrace facility PAZ-983
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.c
diff --git
a/src/pazpar2.c
b/src/pazpar2.c
index
6266d71
..
478188c
100644
(file)
--- a/
src/pazpar2.c
+++ b/
src/pazpar2.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 Index Data
+ Copyright (C) Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-38,6
+38,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/log.h>
#include <yaz/options.h>
#include <yaz/sc.h>
#include <yaz/log.h>
#include <yaz/options.h>
#include <yaz/sc.h>
+#include <yaz/backtrace.h>
// #define MTRACE
#ifdef MTRACE
// #define MTRACE
#ifdef MTRACE
@@
-108,6
+109,9
@@
static int sc_main(
struct conf_config *config = 0;
int test_mode = 0;
struct conf_config *config = 0;
int test_mode = 0;
+ xmlInitParser();
+ LIBXML_TEST_VERSION
+
#ifndef WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
#ifndef WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
@@
-118,6
+122,8
@@
static int sc_main(
yaz_log_init_prefix("pazpar2");
yaz_log_xml_errors(0, YLOG_WARN);
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)
while ((ret = options("dDf:h:l:m:p:R:tu:v:Vw:X", argv, argc, &arg)) != -2)
{
switch (ret)
@@
-208,7
+214,18
@@
static int sc_main(
}
pazpar2_mutex_init();
}
pazpar2_mutex_init();
- config = config_create(config_fname, global_parameters.dump_records);
+ if (!test_mode)
+ {
+ yaz_log(YLOG_LOG, "Pazpar2 start " VERSION " "
+#ifdef PAZPAR2_VERSION_SHA1
+ PAZPAR2_VERSION_SHA1
+#else
+ "-"
+#endif
+ );
+ }
+
+ config = config_create(config_fname);
if (!config)
return 1;
sc_stop_config = config;
if (!config)
return 1;
sc_stop_config = config;
@@
-219,13
+236,6
@@
static int sc_main(
}
else
{
}
else
{
- yaz_log(YLOG_LOG, "Pazpar2 start " VERSION " "
-#ifdef PAZPAR2_VERSION_SHA1
- PAZPAR2_VERSION_SHA1
-#else
- "-"
-#endif
- );
ret = 0;
if (daemon && !log_file_in_use)
{
ret = 0;
if (daemon && !log_file_in_use)
{