/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
yaz_log(YLOG_WARN, "Bad/missing root element for config %s",
control_block.xml_config);
return 0;
-
}
}
return ptr;
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;
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 */
}
#endif
-static void xml_config_open(void)
+static int xml_config_open(void)
{
const char *last_p;
const char *fname = control_block.xml_config;
gfs_nmem = nmem_create();
#if YAZ_HAVE_XML2
if (fname[0] == '\0')
- return;
+ return 0;
if (!xml_config_doc)
{
if (!xml_config_doc)
{
yaz_log(YLOG_FATAL, "Could not parse %s", fname);
- exit(1);
+ return -1;
}
else
{
{
yaz_log(YLOG_WARN, "XInclude processing failed for config %s",
fname);
- exit(1);
+ return -1;
}
}
}
else
xml_config_read(0);
#endif
+ return 0;
}
static void xml_config_close(void)
#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;
+ int ret = 0;
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)
void __cdecl event_loop_thread(IOCHAN iochan)
{
- iochan_event_loop(&iochan);
+ iochan_event_loop(&iochan, 0);
}
/* WIN32 listener */
control_block.one_shot = 1;
if (control_block.threads)
{
- iochan_event_loop(&new_chan);
+ iochan_event_loop(&new_chan, 0);
}
else
{
{
}
-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)
{
- yaz_log(log_server, "Received SIGTERM. PID=%ld", (long) getpid());
- exit(0);
+ sig_received = num;
}
#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];
if (control_block.options_func(argc, argv))
return 1;
- xml_config_open();
+ if (xml_config_open())
+ return 1;
xml_config_bend_start();
}
else
{
- xml_config_add_listeners();
+ if (xml_config_add_listeners())
+ return 1;
if (!pListener)
add_listener("tcp:@:9999", 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;
}