X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fstatserv.c;h=7d4af0b346bb3ea024300e982e8cc8f49bd4fa7e;hb=704aa32f468be55eae352d34dfab808954086ae2;hp=f5aa6d152471c7ba6c6a3d3c20535a701a7105bc;hpb=028cd0d846e6e44649ef699e205b2db453be5522;p=yaz-moved-to-github.git diff --git a/src/statserv.c b/src/statserv.c index f5aa6d1..7d4af0b 100644 --- a/src/statserv.c +++ b/src/statserv.c @@ -1,11 +1,11 @@ /* - * Copyright (C) 1995-2005, Index Data ApS + * Copyright (C) 1995-2006, Index Data ApS * See the file LICENSE for details. * * NT threaded server code by * Chas Woodfield, Fretwell Downing Informatics. * - * $Id: statserv.c,v 1.33 2005-10-20 19:28:04 quinn Exp $ + * $Id: statserv.c,v 1.40 2006-07-07 13:02:21 marc Exp $ */ /** @@ -14,6 +14,7 @@ */ #include +#include #include #include #ifdef WIN32 @@ -35,7 +36,7 @@ #include #endif -#if HAVE_XML2 +#if YAZ_HAVE_XML2 #include #include #include @@ -92,7 +93,7 @@ statserv_options_block control_block = { 1, /* dynamic mode */ 0, /* threaded mode */ 0, /* one shot (single session) */ - YLOG_DEFAULT_LEVEL, /* log level */ + 0, /* __UNUSED_loglevel */ "", /* no PDUs */ "", /* diagnostic output to stderr */ "tcp:@:9999", /* default listener port */ @@ -126,7 +127,8 @@ statserv_options_block control_block = { static int max_sessions = 0; static int logbits_set = 0; -static int log_session = 0; +static int log_session = 0; /* one-line logs for session */ +static int log_sessiondetail = 0; /* more detailed stuff */ static int log_server = 0; /** get_logbits sets global loglevel bits */ @@ -136,6 +138,7 @@ static void get_logbits(int force) { logbits_set = 1; log_session = yaz_log_module_level("session"); + log_sessiondetail = yaz_log_module_level("sessiondetail"); log_server = yaz_log_module_level("server"); } } @@ -143,11 +146,11 @@ static void get_logbits(int force) static int add_listener(char *where, int listen_id); -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static xmlDocPtr xml_config_doc = 0; #endif -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static xmlNodePtr xml_config_get_root() { xmlNodePtr ptr = 0; @@ -167,7 +170,7 @@ static xmlNodePtr xml_config_get_root() } #endif -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static char *nmem_dup_xml_content(NMEM n, xmlNodePtr ptr) { unsigned char *cp; @@ -219,6 +222,11 @@ static struct gfs_server * gfs_server_new() n->cql_transform = 0; n->server_node_ptr = 0; n->directory = 0; + n->docpath = 0; + n->stylesheet = 0; +#if YAZ_HAVE_XML2 + n->retrieval = yaz_retrieval_create(); +#endif return n; } @@ -262,6 +270,7 @@ int control_association(association *assoc, const char *host, int force_open) *cp = '\0'; host = vhost; } + assoc->server = 0; if (control_block.xml_config[0]) { struct gfs_server *gfs; @@ -289,8 +298,7 @@ int control_association(association *assoc, const char *host, int force_open) xfree(assoc->init); assoc->init = 0; } - assoc->cql_transform = gfs->cql_transform; - assoc->server_node_ptr = gfs->server_node_ptr; + assoc->server = gfs; assoc->last_control = &gfs->cb; statserv_setcontrol(&gfs->cb); gfs_server_chdir(gfs); @@ -300,8 +308,6 @@ int control_association(association *assoc, const char *host, int force_open) } statserv_setcontrol(0); assoc->last_control = 0; - assoc->cql_transform = 0; - assoc->server_node_ptr = 0; yaz_log(YLOG_DEBUG, "server select: no match"); return 0; } @@ -309,8 +315,6 @@ int control_association(association *assoc, const char *host, int force_open) { statserv_setcontrol(&control_block); 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; } @@ -320,7 +324,7 @@ static void xml_config_read() { struct gfs_server **gfsp = &gfs_server_list; struct gfs_listen **gfslp = &gfs_listen_list; -#if HAVE_XML2 +#if YAZ_HAVE_XML2 xmlNodePtr ptr = xml_config_get_root(); if (!ptr) @@ -409,6 +413,38 @@ static void xml_config_read() (*gfsp)->directory = nmem_dup_xml_content(gfs_nmem, ptr->children); } + else if (!strcmp((const char *) ptr->name, "docpath")) + { + (*gfsp)->docpath = + nmem_dup_xml_content(gfs_nmem, ptr->children); + } + else if (!strcmp((const char *) ptr->name, "stylesheet")) + { + char *s = nmem_dup_xml_content(gfs_nmem, ptr->children); + (*gfsp)->stylesheet = + nmem_malloc(gfs_nmem, strlen(s) + 2); + sprintf((*gfsp)->stylesheet, "/%s", s); + } + else if (!strcmp((const char *) ptr->name, "explain")) + { + ; /* being processed separately */ + } + else if (!strcmp((const char *) ptr->name, "retrievalinfo")) + { + if (yaz_retrieval_configure((*gfsp)->retrieval, ptr)) + { + yaz_log(YLOG_FATAL, "%s in config %s", + yaz_retrieval_get_error((*gfsp)->retrieval), + control_block.xml_config); + exit(1); + } + } + else + { + yaz_log(YLOG_FATAL, "Unknown element '%s' in config %s", + ptr->name, control_block.xml_config); + exit(1); + } } gfsp = &(*gfsp)->next; } @@ -433,7 +469,7 @@ static void xml_config_open() #endif gfs_nmem = nmem_create(); -#if HAVE_XML2 +#if YAZ_HAVE_XML2 if (control_block.xml_config[0] == '\0') return; @@ -462,7 +498,7 @@ static void xml_config_open() static void xml_config_close() { -#if HAVE_XML2 +#if YAZ_HAVE_XML2 if (xml_config_doc) { xmlFreeDoc(xml_config_doc); @@ -862,7 +898,7 @@ static void listener(IOCHAN h, int event) return; } - yaz_log(log_session, "Connect from %s", cs_addrstr(new_line)); + yaz_log(log_sessiondetail, "Connect from %s", cs_addrstr(new_line)); no_sessions++; if (control_block.dynamic) @@ -885,7 +921,7 @@ static void listener(IOCHAN h, int event) iochan_destroy(pp); } sprintf(nbuf, "%s(%d)", me, no_sessions); - yaz_log_init(control_block.loglevel, nbuf, 0); + yaz_log_init_prefix(nbuf); /* ensure that bend_stop is not called when each child exits - only for the main process .. */ control_block.bend_stop = 0; @@ -979,7 +1015,7 @@ static void *new_session (void *vp) #else a = 0; #endif - yaz_log(log_session, "Starting session %d from %s (pid=%ld)", + yaz_log(log_session, "Session - OK %d %s %ld", no_sessions, a ? a : "[Unknown]", (long) getpid()); if (max_sessions && no_sessions >= max_sessions) control_block.one_shot = 1; @@ -1016,7 +1052,7 @@ static void inetd_connection(int what) iochan_setdata(chan, assoc); iochan_settimeout(chan, 60); addr = cs_addrstr(line); - yaz_log(log_session, "Inetd association from %s", + yaz_log(log_sessiondetail, "Inetd association from %s", addr ? addr : "[UNKNOWN]"); assoc->cs_get_mask = EVENT_INPUT; } @@ -1294,9 +1330,16 @@ int check_options(int argc, char **argv) int ret = 0, r; char *arg; - /* set default log level */ - control_block.loglevel = yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL); - yaz_log_init_level(control_block.loglevel); + if (getenv("YAZ_LOG") == 0) { + /* + * Set default log level. We want to avoid doing this if the + * user has already explicitly specified a preferred default + * log-level, hence the inelegant peek at the YAZ_LOG + * environment variable that will subsequently be interpreted + * by the YAZ logging module itself. + */ + yaz_log_init_level(yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL)); + } get_logbits(1); while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:A:p:DC:f:m:", @@ -1336,7 +1379,7 @@ int check_options(int argc, char **argv) break; case 'l': option_copy(control_block.logfile, arg); - yaz_log_init(control_block.loglevel, me, control_block.logfile); + yaz_log_init_file(control_block.logfile); break; case 'm': if (!arg) { @@ -1345,12 +1388,12 @@ int check_options(int argc, char **argv) } yaz_log_time_format(arg); break; - case 'v': - control_block.loglevel = - yaz_log_mask_str_x(arg,control_block.loglevel); - yaz_log_init(control_block.loglevel, me, control_block.logfile); + case 'v': { + int default_level = yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL); + yaz_log_init_level(yaz_log_mask_str_x(arg, default_level)); get_logbits(1); break; + } case 'a': option_copy(control_block.apdufile, arg); break; @@ -1399,7 +1442,7 @@ int check_options(int argc, char **argv) option_copy(control_block.pid_fname, arg); break; case 'f': -#if HAVE_XML2 +#if YAZ_HAVE_XML2 option_copy(control_block.xml_config, arg); #else fprintf(stderr, "%s: Option -f unsupported since YAZ is compiled without Libxml2 support\n", me);