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
virt_db refactor code WRT target select
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
cdcd244
..
5eb24f8
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-2008 Index Data
+ Copyright (C) 2005-2010 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
@@
-27,14
+27,15
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <stdexcept>
#include <libxml/xinclude.h>
#include <stdexcept>
#include <libxml/xinclude.h>
-#include "filter.hpp"
-#include "package.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
#include "router_flexml.hpp"
#include "factory_static.hpp"
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include "router_flexml.hpp"
#include "factory_static.hpp"
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+#include <signal.h>
#ifdef WIN32
#include <direct.h>
#include <io.h>
#ifdef WIN32
#include <direct.h>
#include <io.h>
@@
-43,12
+44,32
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
namespace mp = metaproxy_1;
namespace mp = metaproxy_1;
+mp::RouterFleXML *routerp = 0;
+
+#if HAVE_UNISTD_H
+static pid_t process_group = 0;
+
+static void sig_term_handler(int s)
+{
+ kill(-process_group, SIGTERM); /* kill all children processes as well */
+ exit(0);
+}
+#endif
+
static void handler(void *data)
{
static void handler(void *data)
{
- mp::RouterFleXML *routerp = (mp::RouterFleXML*) data;
+ routerp = (mp::RouterFleXML*) data;
+
+#if HAVE_UNISTD_H
+ /* make the current working process group leader */
+ setpgid(0, 0);
+ process_group = getpgid(0); // save process group ID
+
+ signal(SIGTERM, sig_term_handler);
+#endif
mp::Package pack;
mp::Package pack;
- pack.router(*routerp).move();
+ pack.router(*routerp).move(); /* should never exit */
}
static int sc_main(
}
static int sc_main(
@@
-103,7
+124,11
@@
static int sc_main(
uid = arg;
break;
case 'V':
uid = arg;
break;
case 'V':
- std::cout << VERSION "\n";
+ std::cout << VERSION;
+#ifdef VERSION_SHA1
+ std::cout << " " VERSION_SHA1;
+#endif
+ std::cout << "\n";
return 0;
break;
case 'w':
return 0;
break;
case 'w':
@@
-132,7
+157,12
@@
static int sc_main(
return 1;
}
return 1;
}
- yaz_log(YLOG_LOG, "Metaproxy " VERSION " started");
+ yaz_log(YLOG_LOG, "Metaproxy start " VERSION
+#ifdef VERSION_SHA1
+ " " VERSION_SHA1
+#endif
+ );
+
xmlDocPtr doc = xmlReadFile(fname,
NULL,
XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
xmlDocPtr doc = xmlReadFile(fname,
NULL,
XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
@@
-144,26
+174,42
@@
static int sc_main(
return 1;
}
// and perform Xinclude then
return 1;
}
// and perform Xinclude then
- if (xmlXIncludeProcess(doc) > 0) {
- yaz_log (YLOG_LOG, "processing XInclude directive");
+ int r = xmlXIncludeProcess(doc);
+ if (r == -1)
+ {
+ yaz_log(YLOG_FATAL, "XInclude processing failed");
+ return 1;
}
}
+ WRBUF base_path = wrbuf_alloc();
+ const char *last_p = strrchr(fname,
+#ifdef WIN32
+ '\\'
+#else
+ '/'
+#endif
+ );
+ if (last_p)
+ wrbuf_write(base_path, fname, last_p - fname);
+
mp::FactoryStatic factory;
mp::FactoryStatic factory;
- mp::RouterFleXML router(doc, factory, false);
+ mp::RouterFleXML *router =
+ new mp::RouterFleXML(doc, factory, false, wrbuf_cstr(base_path));
+ wrbuf_destroy(base_path);
yaz_sc_running(s);
yaz_sc_running(s);
- yaz_daemon("metaproxy", mode, handler, &router, pidfile, uid);
+ yaz_daemon("metaproxy", mode, handler, router, pidfile, uid);
}
catch (std::logic_error &e) {
yaz_log (YLOG_FATAL,"std::logic error: %s" , e.what() );
return 1;
}
catch (std::runtime_error &e) {
}
catch (std::logic_error &e) {
yaz_log (YLOG_FATAL,"std::logic error: %s" , e.what() );
return 1;
}
catch (std::runtime_error &e) {
- yaz_log (YLOG_FATAL, "std::runtime error: %s" , e.what() );
+ yaz_log(YLOG_FATAL, "std::runtime error: %s" , e.what() );
return 1;
}
catch ( ... ) {
return 1;
}
catch ( ... ) {
- yaz_log (YLOG_FATAL, "Unknown Exception");
+ yaz_log(YLOG_FATAL, "Unknown Exception");
return 1;
}
return 0;
return 1;
}
return 0;