/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2011 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 <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>
+// #define MTRACE
+#ifdef MTRACE
+#include <mcheck.h>
+#endif
+
static struct conf_config *sc_stop_config = 0;
void child_handler(void *data)
{
struct conf_config *config = (struct conf_config *) data;
- config_start_databases(config);
+ config_process_events(config);
- pazpar2_event_loop();
+ config_destroy(config);
}
static void show_version(void)
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;
yaz_log_init_prefix("pazpar2");
yaz_log_xml_errors(0, YLOG_WARN);
- while ((ret = options("dDf:h:l:p:tu:VX", argv, argc, &arg)) != -2)
+ while ((ret = options("dDf:h:l:p:R:tu:v:VX", argv, argc, &arg)) != -2)
{
switch (ret)
{
case 'p':
pidfile = arg;
break;
+ case 'R':
+ record_fname = arg;
+ global_parameters.predictable_sessions = 1;
+ break;
case 't':
test_mode = 1;
break;
case 'u':
uid = arg;
break;
+ case 'v':
+ yaz_log_init_level(yaz_log_mask_str(arg));
+ break;
case 'V':
show_version();
+ break;
+ case 'w':
+ if (chdir(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"
" -h [host:]port Listener port\n"
" -l file Log to file\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;
}
+ pazpar2_mutex_init();
+
config = config_create(config_fname, global_parameters.dump_records);
if (!config)
return 1;
}
else
{
- yaz_log(YLOG_LOG, "Pazpar2 %s started", VERSION);
+ 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 = config_start_listeners(config, listener_override);
+ ret = config_start_listeners(config, listener_override, record_fname);
if (ret)
return ret; /* error starting http listener */
{
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);
}