* NT threaded server code by
* Chas Woodfield, Fretwell Downing Informatics.
*
- * $Id: statserv.c,v 1.24 2005-03-03 23:16:20 adam Exp $
+ * $Id: statserv.c,v 1.29 2005-03-14 11:14:21 adam Exp $
*/
/**
#if HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
+#include <libxml/xinclude.h>
#endif
#if YAZ_POSIX_THREADS
static IOCHAN pListener = NULL;
+static char gfs_root_dir[FILENAME_MAX+1];
static struct gfs_server *gfs_server_list = 0;
static struct gfs_listen *gfs_listen_list = 0;
static NMEM gfs_nmem = 0;
static char *me = "statserver"; /* log prefix */
static char *programname="statserver"; /* full program name */
-#if YAZ_POSIX_THREADS
+#ifdef WIN32
+DWORD current_control_tls;
+static int init_control_tls = 0;
+#elif YAZ_POSIX_THREADS
static pthread_key_t current_control_tls;
static int init_control_tls = 0;
#else
n->listen_ref = 0;
n->cql_transform = 0;
n->server_node_ptr = 0;
+ n->directory = 0;
return n;
}
return n;
}
+static void gfs_server_chdir(struct gfs_server *gfs)
+{
+ if (gfs_root_dir[0])
+ {
+ if (chdir(gfs_root_dir))
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "chdir %s", gfs_root_dir);
+ }
+ if (gfs->directory)
+ {
+ if (chdir(gfs->directory))
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "chdir %s",
+ gfs->directory);
+ }
+}
+
int control_association(association *assoc, const char *host, int force_open)
{
char vhost[128], *cp;
{
statserv_setcontrol(assoc->last_control);
if (assoc->backend && assoc->init)
+ {
+ gfs_server_chdir(gfs);
(assoc->last_control->bend_close)(assoc->backend);
+ }
assoc->backend = 0;
xfree(assoc->init);
assoc->init = 0;
assoc->server_node_ptr = gfs->server_node_ptr;
assoc->last_control = &gfs->cb;
statserv_setcontrol(&gfs->cb);
+ gfs_server_chdir(gfs);
+ yaz_log(YLOG_DEBUG, "server select: %s", gfs->cb.configname);
return 1;
}
}
assoc->last_control = 0;
assoc->cql_transform = 0;
assoc->server_node_ptr = 0;
+ yaz_log(YLOG_DEBUG, "server select: no match");
return 0;
}
else
assoc->last_control = &control_block;
assoc->cql_transform = 0;
assoc->server_node_ptr = 0;
+ yaz_log(YLOG_DEBUG, "server select: config=%s", control_block.configname);
return 1;
}
}
return;
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
+ struct _xmlAttr *attr;
if (ptr->type != XML_ELEMENT_NODE)
continue;
- struct _xmlAttr *attr = ptr->properties;
+ attr = ptr->properties;
if (!strcmp((const char *) ptr->name, "listen"))
{
/*
xmlNodePtr ptr_server = ptr;
xmlNodePtr ptr;
const char *listenref = 0;
+ const char *id = 0;
for ( ; attr; attr = attr->next)
- if (!strcmp(attr->name, "listenref")
- && attr->children && attr->children->type == XML_TEXT_NODE)
+ if (!strcmp(attr->name, "listenref") && attr->children &&
+ attr->children->type == XML_TEXT_NODE)
listenref = nmem_dup_xml_content(gfs_nmem, attr->children);
+ else if (!strcmp(attr->name, "id") && attr->children &&
+ attr->children->type == XML_TEXT_NODE)
+ id = nmem_dup_xml_content(gfs_nmem, attr->children);
+ else
+ yaz_log(YLOG_WARN, "Unknown attribute '%s' for server",
+ attr->name);
*gfsp = gfs_server_new();
(*gfsp)->server_node_ptr = ptr_server;
if (listenref)
(*gfsp)->host = nmem_dup_xml_content(gfs_nmem,
ptr->children);
}
- if (!strcmp((const char *) ptr->name, "config"))
+ else if (!strcmp((const char *) ptr->name, "config"))
{
strcpy((*gfsp)->cb.configname,
nmem_dup_xml_content(gfs_nmem, ptr->children));
}
- if (!strcmp((const char *) ptr->name, "cql2rpn"))
+ else if (!strcmp((const char *) ptr->name, "cql2rpn"))
{
(*gfsp)->cql_transform = cql_transform_open_fname(
nmem_dup_xml_content(gfs_nmem, ptr->children)
);
}
+ else if (!strcmp((const char *) ptr->name, "directory"))
+ {
+ (*gfsp)->directory =
+ nmem_dup_xml_content(gfs_nmem, ptr->children);
+ }
}
gfsp = &(*gfsp)->next;
}
static void xml_config_open()
{
+ if (!getcwd(gfs_root_dir, FILENAME_MAX))
+ {
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "getcwd failed");
+ gfs_root_dir[0] = '\0';
+ }
+#ifdef WIN32
+ init_control_tls = 1;
+ current_control_tls = TlsAlloc();
+#elif YAZ_POSIX_THREADS
+ init_control_tls = 1;
+ pthread_key_create(¤t_control_tls, 0);
+#endif
+
gfs_nmem = nmem_create();
#if HAVE_XML2
if (control_block.xml_config[0] == '\0')
xml_config_doc = xmlParseFile(control_block.xml_config);
if (!xml_config_doc)
{
- yaz_log(YLOG_WARN, "Could not parse %s", control_block.xml_config);
- return ;
+ yaz_log(YLOG_FATAL, "Could not parse %s", control_block.xml_config);
+ exit(1);
+ }
+ else
+ {
+ int noSubstitutions = xmlXIncludeProcess(xml_config_doc);
+ if (noSubstitutions == -1)
+ {
+ yaz_log(YLOG_WARN, "XInclude processing failed for config %s",
+ control_block.xml_config);
+ exit(1);
+ }
}
}
xml_config_read();
-
#endif
}
#endif
gfs_server_list = 0;
nmem_destroy(gfs_nmem);
+#ifdef WIN32
+ if (init_control_tls)
+ TlsFree(current_control_tls);
+#elif YAZ_POSIX_THREADS
+ if (init_control_tls)
+ pthread_key_delete(current_control_tls);
+#endif
}
static void xml_config_add_listeners()
gfs->cb.configname);
statserv_setcontrol(&gfs->cb);
if (control_block.bend_start)
+ {
+ gfs_server_chdir(gfs);
(control_block.bend_start)(&gfs->cb);
+ }
}
}
else
if (control_block.bend_start)
(*control_block.bend_start)(&control_block);
}
-
}
static void xml_config_bend_stop()
yaz_log(YLOG_DEBUG, "Accept ok");
if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session,
- EVENT_INPUT, parent_chan->port)))
+ EVENT_INPUT, parent_chan->chan_id)))
{
yaz_log(YLOG_FATAL, "Failed to create iochan");
iochan_destroy(h);
iochan_destroy(p);
}
xml_config_close();
-#if YAZ_POSIX_THREADS
- pthread_key_delete(current_control_tls);
-#endif
}
void sigterm(int sig)
statserv_options_block *statserv_getcontrol(void)
{
-#if YAZ_POSIX_THREADS
+#ifdef WIN32
+ if (init_control_tls)
+ return (statserv_options_block *) TlsGetValue(current_control_tls);
+ else
+ return &control_block;
+#elif YAZ_POSIX_THREADS
if (init_control_tls)
return pthread_getspecific(current_control_tls);
else
void statserv_setcontrol(statserv_options_block *block)
{
-#if YAZ_POSIX_THREADS
+ chdir(gfs_root_dir);
+#ifdef WIN32
+ if (init_control_tls)
+ TlsSetValue(current_control_tls, block);
+#elif YAZ_POSIX_THREADS
if (init_control_tls)
pthread_setspecific(current_control_tls, block);
#else
if (control_block.options_func(argc, argv))
return 1;
-#if YAZ_POSIX_THREADS
- init_control_tls = 1;
- pthread_key_create(¤t_control_tls, 0);
-#endif
-
xml_config_open();
xml_config_bend_start();