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
Bump year
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
19434be
..
c6d582f
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
@@
-90,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);
}
@@
-197,11
+200,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);
@@
-261,6
+264,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;
}