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
Log HTTP responses if option -d is given twice
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.c
diff --git
a/src/pazpar2.c
b/src/pazpar2.c
index
7f69902
..
f4bec6c
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>
@@
-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)
@@
-114,7
+123,7
@@
static int sc_main(
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;
@@
-134,6
+143,7
@@
static int sc_main(
break;
case 'R':
record_fname = arg;
break;
case 'R':
record_fname = arg;
+ global_parameters.predictable_sessions = 1;
break;
case 't':
test_mode = 1;
break;
case 't':
test_mode = 1;
@@
-146,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"
@@
-162,6
+187,7
@@
static int sc_main(
" -u uid Change user to uid\n"
" -V Show version\n"
" -v level Set log level\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"
@@
-227,10
+253,20
@@
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);
}