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
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.c
diff --git
a/src/pazpar2.c
b/src/pazpar2.c
index
d6423a6
..
cb0d162
100644
(file)
--- a/
src/pazpar2.c
+++ b/
src/pazpar2.c
@@
-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>
@@
-100,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;
@@
-113,7
+118,7
@@
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:VX", argv, argc, &arg)) != -2)
{
switch (ret)
{
{
switch (ret)
{
@@
-136,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;
@@
-147,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"
@@
-158,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"
@@
-202,7
+228,7
@@
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 */