projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 5.7.3
[yaz-moved-to-github.git]
/
src
/
statserv.c
diff --git
a/src/statserv.c
b/src/statserv.c
index
fba26a1
..
815b2e9
100644
(file)
--- a/
src/statserv.c
+++ b/
src/statserv.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-163,7
+163,6
@@
static xmlNodePtr xml_config_get_root(void)
yaz_log(YLOG_WARN, "Bad/missing root element for config %s",
control_block.xml_config);
return 0;
yaz_log(YLOG_WARN, "Bad/missing root element for config %s",
control_block.xml_config);
return 0;
-
}
}
return ptr;
}
}
return ptr;
@@
-227,6
+226,7
@@
static struct gfs_server * gfs_server_new(const char *id)
n->directory = 0;
n->docpath = 0;
n->stylesheet = 0;
n->directory = 0;
n->docpath = 0;
n->stylesheet = 0;
+ n->client_query_charset = 0;
n->id = nmem_strdup_null(gfs_nmem, id);
n->retrieval = yaz_retrieval_create();
return n;
n->id = nmem_strdup_null(gfs_nmem, id);
n->retrieval = yaz_retrieval_create();
return n;
@@
-491,6
+491,12
@@
static void xml_config_read(const char *base_path)
nmem_malloc(gfs_nmem, strlen(s) + 2);
sprintf(gfs->stylesheet, "/%s", s);
}
nmem_malloc(gfs_nmem, strlen(s) + 2);
sprintf(gfs->stylesheet, "/%s", s);
}
+ else if (!strcmp((const char *) ptr->name,
+ "client_query_charset"))
+ {
+ gfs->client_query_charset =
+ nmem_dup_xml_content(gfs_nmem, ptr->children);
+ }
else if (!strcmp((const char *) ptr->name, "explain"))
{
; /* being processed separately */
else if (!strcmp((const char *) ptr->name, "explain"))
{
; /* being processed separately */
@@
-521,7
+527,7
@@
static void xml_config_read(const char *base_path)
}
#endif
}
#endif
-static void xml_config_open(void)
+static int xml_config_open(void)
{
const char *last_p;
const char *fname = control_block.xml_config;
{
const char *last_p;
const char *fname = control_block.xml_config;
@@
-541,7
+547,7
@@
static void xml_config_open(void)
gfs_nmem = nmem_create();
#if YAZ_HAVE_XML2
if (fname[0] == '\0')
gfs_nmem = nmem_create();
#if YAZ_HAVE_XML2
if (fname[0] == '\0')
- return;
+ return 0;
if (!xml_config_doc)
{
if (!xml_config_doc)
{
@@
-549,7
+555,7
@@
static void xml_config_open(void)
if (!xml_config_doc)
{
yaz_log(YLOG_FATAL, "Could not parse %s", fname);
if (!xml_config_doc)
{
yaz_log(YLOG_FATAL, "Could not parse %s", fname);
- exit(1);
+ return -1;
}
else
{
}
else
{
@@
-558,7
+564,7
@@
static void xml_config_open(void)
{
yaz_log(YLOG_WARN, "XInclude processing failed for config %s",
fname);
{
yaz_log(YLOG_WARN, "XInclude processing failed for config %s",
fname);
- exit(1);
+ return -1;
}
}
}
}
}
}
@@
-579,6
+585,7
@@
static void xml_config_open(void)
else
xml_config_read(0);
#endif
else
xml_config_read(0);
#endif
+ return 0;
}
static void xml_config_close(void)
}
static void xml_config_close(void)
@@
-601,16
+608,18
@@
static void xml_config_close(void)
#endif
}
#endif
}
-static void xml_config_add_listeners(void)
+static int xml_config_add_listeners(void)
{
struct gfs_listen *gfs = gfs_listen_list;
int id_no;
{
struct gfs_listen *gfs = gfs_listen_list;
int id_no;
+ int ret = 0;
for (id_no = 1; gfs; gfs = gfs->next, id_no++)
{
for (id_no = 1; gfs; gfs = gfs->next, id_no++)
{
- if (gfs->address)
- add_listener(gfs->address, id_no);
+ if (!ret && gfs->address)
+ ret = add_listener(gfs->address, id_no);
}
}
+ return ret;
}
static void xml_config_bend_start(void)
}
static void xml_config_bend_start(void)
@@
-830,7
+839,7
@@
static void statserv_closedown()
void __cdecl event_loop_thread(IOCHAN iochan)
{
void __cdecl event_loop_thread(IOCHAN iochan)
{
- iochan_event_loop(&iochan);
+ iochan_event_loop(&iochan, 0);
}
/* WIN32 listener */
}
/* WIN32 listener */
@@
-1078,7
+1087,7
@@
static void *new_session(void *vp)
control_block.one_shot = 1;
if (control_block.threads)
{
control_block.one_shot = 1;
if (control_block.threads)
{
- iochan_event_loop(&new_chan);
+ iochan_event_loop(&new_chan, 0);
}
else
{
}
else
{
@@
-1245,20
+1254,21
@@
static void statserv_reset(void)
{
}
{
}
-static void daemon_handler(void *data)
-{
- IOCHAN *pListener = data;
- iochan_event_loop(pListener);
-}
+static int sig_received = 0;
#ifndef WIN32
static void normal_stop_handler(int num)
{
#ifndef WIN32
static void normal_stop_handler(int num)
{
- yaz_log(log_server, "Received SIGTERM. PID=%ld", (long) getpid());
- exit(0);
+ sig_received = num;
}
#endif
}
#endif
+static void daemon_handler(void *data)
+{
+ IOCHAN *pListener = data;
+ iochan_event_loop(pListener, &sig_received);
+}
+
static void show_version(void)
{
char vstr[20], sha1_str[41];
static void show_version(void)
{
char vstr[20], sha1_str[41];
@@
-1294,7
+1304,8
@@
static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
if (control_block.options_func(argc, argv))
return 1;
if (control_block.options_func(argc, argv))
return 1;
- xml_config_open();
+ if (xml_config_open())
+ return 1;
xml_config_bend_start();
xml_config_bend_start();
@@
-1308,7
+1319,8
@@
static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
}
else
{
}
else
{
- xml_config_add_listeners();
+ if (xml_config_add_listeners())
+ return 1;
if (!pListener)
add_listener("tcp:@:9999", 0);
if (!pListener)
add_listener("tcp:@:9999", 0);
@@
-1331,6
+1343,10
@@
static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
daemon_handler, &pListener,
*control_block.pid_fname ? control_block.pid_fname : 0,
*control_block.setuid ? control_block.setuid : 0);
daemon_handler, &pListener,
*control_block.pid_fname ? control_block.pid_fname : 0,
*control_block.setuid ? control_block.setuid : 0);
+#ifndef WIN32
+ if (sig_received)
+ yaz_log(YLOG_LOG, "Received SIGTERM PID=%ld", (long) getpid());
+#endif
return 0;
}
return 0;
}