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
session_shared: shut down expire thread
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
19434be
..
481901b
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) 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
@@
-30,8
+30,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <metaproxy/filter.hpp>
#include <metaproxy/package.hpp>
#include <metaproxy/util.hpp>
#include <metaproxy/filter.hpp>
#include <metaproxy/package.hpp>
#include <metaproxy/util.hpp>
-#include "router_flexml.hpp"
-#include "factory_static.hpp"
+#include <metaproxy/router_xml.hpp>
#if HAVE_UNISTD_H
#include <unistd.h>
#if HAVE_UNISTD_H
#include <unistd.h>
@@
-45,7
+44,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
namespace mp = metaproxy_1;
namespace mp = metaproxy_1;
-mp::RouterFleXML *routerp = 0;
+mp::RouterXML *routerp = 0;
static void set_log_prefix(void)
{
static void set_log_prefix(void)
{
@@
-59,19
+58,22
@@
static void set_log_prefix(void)
#if HAVE_UNISTD_H
static pid_t process_group = 0;
#if HAVE_UNISTD_H
static pid_t process_group = 0;
+static int sig_received = 0;
-static void sig_usr1_handler(int s)
+static void sig_usr1_handler(int signo)
{
{
- yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
- routerp->stop();
+ sig_received = signo;
+ if (routerp)
+ routerp->stop(signo);
}
}
-static void sig_term_handler(int s)
+static void sig_term_handler(int signo)
{
{
- yaz_log(YLOG_LOG, "metaproxy received SIGTERM");
- yaz_log(YLOG_LOG, "metaproxy stop");
- kill(-process_group, SIGTERM); /* kill all children processes as well */
- _exit(0);
+ sig_received = signo;
+ if (routerp)
+ {
+ routerp->stop(signo);
+ }
}
#endif
}
#endif
@@
-84,12
+86,17
@@
static void work_common(void *data)
signal(SIGTERM, sig_term_handler);
signal(SIGUSR1, sig_usr1_handler);
#endif
signal(SIGTERM, sig_term_handler);
signal(SIGUSR1, sig_usr1_handler);
#endif
- routerp = (mp::RouterFleXML*) data;
+ routerp = (mp::RouterXML*) data;
routerp->start();
mp::Package pack;
pack.router(*routerp).move();
routerp->start();
mp::Package pack;
pack.router(*routerp).move();
- yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
+ yaz_log(YLOG_LOG, "metaproxy stop");
+ delete routerp;
+ routerp = 0;
+#if HAVE_UNISTD_H
+ kill(-process_group, SIGTERM); /* kill all children processes as well */
+#endif
_exit(0);
}
_exit(0);
}
@@
-121,7
+128,7
@@
static int sc_main(
set_log_prefix();
set_log_prefix();
- while ((ret = options("c{config}:Dh{help}l:p:tu:V{version}w:X",
+ while ((ret = options("c{config}:Dh{help}l:m:p:tu:v:V{version}w:X",
argv, argc, &arg)) != -2)
{
switch (ret)
argv, argc, &arg)) != -2)
{
switch (ret)
@@
-136,9
+143,11
@@
static int sc_main(
std::cerr << "metaproxy\n"
" -h|--help help\n"
" -V|--version version\n"
std::cerr << "metaproxy\n"
" -h|--help help\n"
" -V|--version version\n"
+ " -v level\n"
" -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"
@@
-154,6
+163,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;
@@
-163,6
+175,9
@@
static int sc_main(
case 'u':
uid = arg;
break;
case 'u':
uid = arg;
break;
+ case 'v':
+ yaz_log_init_level(yaz_log_mask_str(arg));
+ break;
case 'V':
std::cout << VERSION;
#ifdef VERSION_SHA1
case 'V':
std::cout << VERSION;
#ifdef VERSION_SHA1
@@
-197,11
+212,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);
@@
-236,9
+251,8
@@
static int sc_main(
wrbuf_puts(base_path, ".");
ret = 0;
try {
wrbuf_puts(base_path, ".");
ret = 0;
try {
- mp::FactoryStatic factory;
- mp::RouterFleXML *router =
- new mp::RouterFleXML(doc, factory, test_config, wrbuf_cstr(base_path));
+ mp::RouterXML *router =
+ new mp::RouterXML(doc, test_config, wrbuf_cstr(base_path));
if (!test_config)
{
if (!test_config)
{
@@
-261,6
+275,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;
}