/* This file is part of Pazpar2.
- Copyright (C) 2006-2010 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
#endif
#ifdef WIN32
#include <winsock.h>
+#include <direct.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
#endif
#include <signal.h>
#include <assert.h>
#include "parameters.h"
-#include "pazpar2.h"
+#include "session.h"
+#include "ppmutex.h"
#include <yaz/daemon.h>
#include <yaz/log.h>
#include <yaz/options.h>
#include <yaz/sc.h>
+#include <yaz/backtrace.h>
+
+// #define MTRACE
+#ifdef MTRACE
+#include <mcheck.h>
+#endif
static struct conf_config *sc_stop_config = 0;
{
struct conf_config *config = (struct conf_config *) data;
- config_start_databases(config);
-
- pazpar2_event_loop();
+ config_process_events(config);
config_destroy(config);
}
static void show_version(void)
{
- char yaz_version_str[80];
- printf("Pazpar2 " PACKAGE_VERSION
+ char yaz_version_str[20];
+ printf("Pazpar2 " PACKAGE_VERSION
#ifdef PAZPAR2_VERSION_SHA1
" "
PAZPAR2_VERSION_SHA1
printf(" yaz:%s", yaz_version_str);
printf("\n");
exit(0);
-}
+}
#ifdef WIN32
static int tcpip_init (void)
static int sc_main(
- yaz_sc_t s,
+ yaz_sc_t s,
int argc, char **argv)
{
int daemon = 0;
const char *uid = 0;
const char *listener_override = 0;
const char *config_fname = 0;
+ const char *record_fname = 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");
#endif
yaz_log_init_prefix("pazpar2");
+ yaz_log_init_level(yaz_log_mask_str("post"));
yaz_log_xml_errors(0, YLOG_WARN);
- while ((ret = options("dDf:h:l:p:tu:v:VX", 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)
{
case 'd':
- global_parameters.dump_records = 1;
+ global_parameters.dump_records++;
break;
case 'D':
daemon = 1;
yaz_log_init_file(arg);
log_file_in_use = 1;
break;
+ case 'm':
+ yaz_log_time_format(arg);
+ break;
case 'p':
pidfile = arg;
break;
+ case 'R':
+ if (strcmp(arg, "-"))
+ record_fname = arg;
+ global_parameters.predictable_sessions = 1;
+ break;
case 't':
test_mode = 1;
break;
break;
case 'V':
show_version();
+ break;
+ case 'w':
+ if (
+#ifdef WIN32
+ _chdir
+#else
+ chdir
+#endif
+ (arg))
+ {
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "chdir %s", arg);
+ return 1;
+ }
+ break;
case 'X':
- global_parameters.debug_mode = 1;
+ global_parameters.debug_mode++;
+ global_parameters.predictable_sessions = 1;
break;
default:
fprintf(stderr, "Usage: pazpar2\n"
" -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"
" -u uid Change user to uid\n"
" -V Show version\n"
" -v level Set log level\n"
+ " -w dir Working directory\n"
" -X Debug mode\n"
#ifdef WIN32
" -install Install windows service\n"
yaz_log(YLOG_FATAL, "Configuration must be given with option -f");
return 1;
}
- config = config_create(config_fname, global_parameters.dump_records);
+ pazpar2_mutex_init();
+
+ {
+ 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;
+ ret = 0;
if (test_mode)
{
yaz_log(YLOG_LOG, "Configuration OK");
}
else
{
- yaz_log(YLOG_LOG, "Pazpar2 " VERSION " "
-#ifdef PAZPAR2_VERSION_SHA1
- PAZPAR2_VERSION_SHA1
-#else
- "-"
-#endif
- " started");
if (daemon && !log_file_in_use)
{
yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
"mode");
- return 1;
+ ret = 1;
}
- ret = config_start_listeners(config, listener_override);
- if (ret)
- return ret; /* error starting http listener */
-
- yaz_sc_running(s);
-
- yaz_daemon("pazpar2",
- (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
- (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
- child_handler, config /* child_data */,
- pidfile, uid);
+ if (!ret)
+ ret = config_start_listeners(config, listener_override,
+ record_fname);
+ if (!ret)
+ {
+ yaz_sc_running(s);
+ yaz_daemon("pazpar2",
+ (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
+ (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
+ child_handler, config /* child_data */,
+ pidfile, uid);
+ }
+ yaz_log(YLOG_LOG, "Pazpar2 stop");
}
- return 0;
+ config_destroy(config);
+ return ret;
}
int ret;
yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
+#ifdef MTRACE
+ mtrace();
+#endif
+
ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
yaz_sc_destroy(&s);
+
+#ifdef MTRACE
+ muntrace();
+#endif
+
+
exit(ret);
}
projects / pazpar2-moved-to-github.git / blobdiff