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
Allow merge on merged content
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.c
diff --git
a/src/pazpar2.c
b/src/pazpar2.c
index
6680662
..
6afccf1
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-2011 Index Data
+ Copyright (C) 2006-2012 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
@@
-22,6
+22,10
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#endif
#ifdef WIN32
#include <winsock.h>
#endif
#ifdef WIN32
#include <winsock.h>
+#include <direct.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
#endif
#include <signal.h>
#endif
#include <signal.h>
@@
-35,6
+39,11
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/options.h>
#include <yaz/sc.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)
static struct conf_config *sc_stop_config = 0;
void child_handler(void *data)
@@
-49,7
+58,7
@@
void child_handler(void *data)
static void show_version(void)
{
char yaz_version_str[80];
static void show_version(void)
{
char yaz_version_str[80];
- printf("Pazpar2 " PACKAGE_VERSION
+ printf("Pazpar2 " PACKAGE_VERSION
#ifdef PAZPAR2_VERSION_SHA1
" "
PAZPAR2_VERSION_SHA1
#ifdef PAZPAR2_VERSION_SHA1
" "
PAZPAR2_VERSION_SHA1
@@
-67,7
+76,7
@@
static void show_version(void)
printf(" yaz:%s", yaz_version_str);
printf("\n");
exit(0);
printf(" yaz:%s", yaz_version_str);
printf("\n");
exit(0);
-}
+}
#ifdef WIN32
static int tcpip_init (void)
#ifdef WIN32
static int tcpip_init (void)
@@
-84,7
+93,7
@@
static int tcpip_init (void)
static int sc_main(
static int sc_main(
- yaz_sc_t s,
+ yaz_sc_t s,
int argc, char **argv)
{
int daemon = 0;
int argc, char **argv)
{
int daemon = 0;
@@
-95,6
+104,7
@@
static int sc_main(
const char *uid = 0;
const char *listener_override = 0;
const char *config_fname = 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;
struct conf_config *config = 0;
int test_mode = 0;
@@
-108,12
+118,12
@@
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);
- while ((ret = options("dDf:h:l:p:tu:v:VX", argv, argc, &arg)) != -2)
+ while ((ret = options("dDf:h:l:p:R:tu:v:Vw:X", argv, argc, &arg)) != -2)
{
switch (ret)
{
case 'd':
{
switch (ret)
{
case 'd':
- global_parameters.dump_records = 1;
+ global_parameters.dump_records++;
break;
case 'D':
daemon = 1;
break;
case 'D':
daemon = 1;
@@
-131,6
+141,10
@@
static int sc_main(
case 'p':
pidfile = arg;
break;
case 'p':
pidfile = arg;
break;
+ case 'R':
+ record_fname = arg;
+ global_parameters.predictable_sessions = 1;
+ break;
case 't':
test_mode = 1;
break;
case 't':
test_mode = 1;
break;
@@
-142,8
+156,23
@@
static int sc_main(
break;
case 'V':
show_version();
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++;
case 'X':
global_parameters.debug_mode++;
+ global_parameters.predictable_sessions = 1;
break;
default:
fprintf(stderr, "Usage: pazpar2\n"
break;
default:
fprintf(stderr, "Usage: pazpar2\n"
@@
-153,10
+182,12
@@
static int sc_main(
" -h [host:]port Listener port\n"
" -l file Log to file\n"
" -p pidfile PID file\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"
" -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"
" -X Debug mode\n"
#ifdef WIN32
" -install Install windows service\n"
@@
-172,7
+203,7
@@
static int sc_main(
return 1;
}
pazpar2_mutex_init();
return 1;
}
pazpar2_mutex_init();
-
+
config = config_create(config_fname, global_parameters.dump_records);
if (!config)
return 1;
config = config_create(config_fname, global_parameters.dump_records);
if (!config)
return 1;
@@
-197,12
+228,12
@@
static int sc_main(
"mode");
return 1;
}
"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 */
if (ret)
return ret; /* error starting http listener */
-
+
yaz_sc_running(s);
yaz_sc_running(s);
-
+
yaz_daemon("pazpar2",
(global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
(daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
yaz_daemon("pazpar2",
(global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
(daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
@@
-223,9
+254,19
@@
int main(int argc, char **argv)
int ret;
yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
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);
ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
yaz_sc_destroy(&s);
+
+#ifdef MTRACE
+ muntrace();
+#endif
+
+
exit(ret);
}
exit(ret);
}