/* 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
#include <yaz/log.h>
#include <yaz/options.h>
#include <yaz/sc.h>
+#include <yaz/backtrace.h>
// #define MTRACE
#ifdef MTRACE
static void show_version(void)
{
- char yaz_version_str[80];
+ char yaz_version_str[20];
printf("Pazpar2 " PACKAGE_VERSION
#ifdef PAZPAR2_VERSION_SHA1
" "
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");
yaz_log_init_prefix("pazpar2");
yaz_log_xml_errors(0, YLOG_WARN);
- while ((ret = options("dDf:h:l:p:R:tu:v:Vw:X", argv, argc, &arg)) != -2)
+ 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)
{
yaz_log_init_file(arg);
log_file_in_use = 1;
break;
+ case 'm':
+ yaz_log_time_format(arg);
+ break;
case 'p':
pidfile = arg;
break;
" -f configfile Configuration\n"
" -h [host:]port Listener port\n"
" -l file Log to file\n"
+ " -m logformat log time format (strftime)\n"
" -p pidfile PID file\n"
" -R recfile HTTP recording file\n"
" -t Test configuration\n"
}
pazpar2_mutex_init();
- config = config_create(config_fname, global_parameters.dump_records);
+ {
+ char yaz_version_str[20];
+ char yaz_sha1_str[41];
+ yaz_log(YLOG_LOG, "Pazpar2 %s " VERSION " "
+#ifdef PAZPAR2_VERSION_SHA1
+ PAZPAR2_VERSION_SHA1
+#else
+ "-"
+#endif
+ , test_mode ? "test" : "start");
+ yaz_version(yaz_version_str, yaz_sha1_str);
+ yaz_log(YLOG_LOG, "YAZ %s %s", yaz_version_str, yaz_sha1_str);
+ }
+
+ config = config_create(config_fname);
if (!config)
return 1;
sc_stop_config = config;
}
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)
{