projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add response rewrite rule
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
b30fc0b
..
6f48973
100644
(file)
--- a/
src/metaproxy_prog.cpp
+++ b/
src/metaproxy_prog.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2012 Index Data
+ Copyright (C) 2005-2013 Index Data
Metaproxy 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
Metaproxy 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
@@
-47,6
+47,16
@@
namespace mp = metaproxy_1;
mp::RouterFleXML *routerp = 0;
mp::RouterFleXML *routerp = 0;
+static void set_log_prefix(void)
+{
+#if HAVE_UNISTD_H
+ char str[80];
+
+ sprintf(str, "%lld", (long long) getpid());
+ yaz_log_init_prefix(str);
+#endif
+}
+
#if HAVE_UNISTD_H
static pid_t process_group = 0;
#if HAVE_UNISTD_H
static pid_t process_group = 0;
@@
-67,6
+77,7
@@
static void sig_term_handler(int s)
static void work_common(void *data)
{
static void work_common(void *data)
{
+ set_log_prefix();
#if HAVE_UNISTD_H
process_group = getpgid(0); // save process group ID
#if HAVE_UNISTD_H
process_group = getpgid(0); // save process group ID
@@
-79,6
+90,9
@@
static void work_common(void *data)
mp::Package pack;
pack.router(*routerp).move();
yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
mp::Package pack;
pack.router(*routerp).move();
yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
+#if HAVE_UNISTD_H
+ kill(-process_group, SIGTERM); /* kill all children processes as well */
+#endif
_exit(0);
}
_exit(0);
}
@@
-108,7
+122,9
@@
static int sc_main(
const char *pidfile = 0;
const char *uid = 0;
const char *pidfile = 0;
const char *uid = 0;
- while ((ret = options("c{config}:Dh{help}l:p:tu:V{version}w:X",
+ set_log_prefix();
+
+ while ((ret = options("c{config}:Dh{help}l:m:p:tu:V{version}w:X",
argv, argc, &arg)) != -2)
{
switch (ret)
argv, argc, &arg)) != -2)
{
switch (ret)
@@
-126,6
+142,7
@@
static int sc_main(
" -c|--config f config filename\n"
" -D daemon and keepalive operation\n"
" -l f log file f\n"
" -c|--config f config filename\n"
" -D daemon and keepalive operation\n"
" -l f log file f\n"
+ " -m logformat log time format (strftime)\n"
" -p f pid file f\n"
" -t test configuration\n"
" -u id change uid to id\n"
" -p f pid file f\n"
" -t test configuration\n"
" -u id change uid to id\n"
@@
-141,6
+158,9
@@
static int sc_main(
case 'l':
yaz_log_init_file(arg);
break;
case 'l':
yaz_log_init_file(arg);
break;
+ case 'm':
+ yaz_log_time_format(arg);
+ break;
case 'p':
pidfile = arg;
break;
case 'p':
pidfile = arg;
break;
@@
-184,11
+204,11
@@
static int sc_main(
return 1;
}
return 1;
}
- if (!test_config)
- yaz_log(YLOG_LOG, "metaproxy start " VERSION
+ yaz_log(YLOG_LOG, "metaproxy %s " VERSION
#ifdef VERSION_SHA1
" " VERSION_SHA1
#endif
#ifdef VERSION_SHA1
" " VERSION_SHA1
#endif
+ , test_config ? "test" : "start"
);
yaz_log_xml_errors(0, YLOG_LOG);
);
yaz_log_xml_errors(0, YLOG_LOG);
@@
-248,6
+268,8
@@
static int sc_main(
ret = 1;
}
xmlFreeDoc(doc);
ret = 1;
}
xmlFreeDoc(doc);
+ if (test_config)
+ yaz_log(YLOG_LOG, "metaproxy test exit code %d", ret);
return ret;
}
return ret;
}