X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fstatserv.c;h=f84c34517e4eebbc1d8cfad9787c43c39e8d1bef;hp=487153e5649f8077f9d8a6cc607132bc04a40293;hb=e7377c90323e05943dcf318c172a5728605fd9b5;hpb=4f3bcae93d51a26709c12b51261c3d95af610cb2 diff --git a/src/statserv.c b/src/statserv.c index 487153e..f84c345 100644 --- a/src/statserv.c +++ b/src/statserv.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ @@ -99,7 +99,7 @@ statserv_options_block control_block = { "tcp:@:9999", /* default listener port */ PROTO_Z3950, /* default application protocol */ 900, /* idle timeout (seconds) */ - 1024*1024, /* maximum PDU size (approx.) to allow */ + 64*1024*1024, /* maximum PDU size (approx.) to allow */ "default-config", /* configuration name to pass to backend */ "", /* set user id */ 0, /* bend_start handler */ @@ -164,7 +164,7 @@ static xmlNodePtr xml_config_get_root(void) yaz_log(YLOG_WARN, "Bad/missing root element for config %s", control_block.xml_config); return 0; - + } } return ptr; @@ -214,7 +214,7 @@ static char *nmem_dup_xml_content(NMEM n, xmlNodePtr ptr) #endif #if YAZ_HAVE_XML2 -static struct gfs_server * gfs_server_new(void) +static struct gfs_server * gfs_server_new(const char *id) { struct gfs_server *n = (struct gfs_server *) nmem_malloc(gfs_nmem, sizeof(*n)); @@ -228,13 +228,14 @@ static struct gfs_server * gfs_server_new(void) n->directory = 0; n->docpath = 0; n->stylesheet = 0; + n->id = nmem_strdup_null(gfs_nmem, id); n->retrieval = yaz_retrieval_create(); return n; } #endif #if YAZ_HAVE_XML2 -static struct gfs_listen * gfs_listen_new(const char *id, +static struct gfs_listen * gfs_listen_new(const char *id, const char *address) { struct gfs_listen *n = (struct gfs_listen *) @@ -307,7 +308,7 @@ int control_association(association *assoc, const char *host, int force_open) assoc->server = gfs; assoc->last_control = &gfs->cb; statserv_setcontrol(&gfs->cb); - + gfs_server_chdir(gfs); break; } @@ -324,7 +325,7 @@ int control_association(association *assoc, const char *host, int force_open) statserv_setcontrol(&control_block); assoc->last_control = &control_block; } - yaz_log(YLOG_DEBUG, "server select: config=%s", + yaz_log(YLOG_DEBUG, "server select: config=%s", assoc->last_control->configname); assoc->maximumRecordSize = assoc->last_control->maxrecordsize; @@ -376,7 +377,7 @@ static void xml_config_read(void) struct gfs_server *gfs; for ( ; attr; attr = attr->next) - if (!xmlStrcmp(attr->name, BAD_CAST "listenref") + if (!xmlStrcmp(attr->name, BAD_CAST "listenref") && attr->children && attr->children->type == XML_TEXT_NODE) listenref = nmem_dup_xml_content(gfs_nmem, attr->children); else if (!xmlStrcmp(attr->name, BAD_CAST "id") @@ -386,7 +387,7 @@ static void xml_config_read(void) else yaz_log(YLOG_WARN, "Unknown attribute '%s' for server", attr->name); - gfs = *gfsp = gfs_server_new(); + gfs = *gfsp = gfs_server_new(id); gfs->server_node_ptr = ptr_server; if (listenref) { @@ -418,9 +419,14 @@ static void xml_config_read(void) } else if (!strcmp((const char *) ptr->name, "cql2rpn")) { - gfs->cql_transform = cql_transform_open_fname( - nmem_dup_xml_content(gfs_nmem, ptr->children) - ); + char *name = nmem_dup_xml_content(gfs_nmem, ptr->children); + gfs->cql_transform = cql_transform_open_fname(name); + if (!gfs->cql_transform) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, + "open CQL transform file '%s'", name); + exit(1); + } } else if (!strcmp((const char *) ptr->name, "ccl2rpn")) { @@ -438,12 +444,12 @@ static void xml_config_read(void) } else if (!strcmp((const char *) ptr->name, "directory")) { - gfs->directory = + gfs->directory = nmem_dup_xml_content(gfs_nmem, ptr->children); } else if (!strcmp((const char *) ptr->name, "docpath")) { - gfs->docpath = + gfs->docpath = nmem_dup_xml_content(gfs_nmem, ptr->children); } else if (!strcmp((const char *) ptr->name, "maximumrecordsize")) @@ -465,7 +471,7 @@ static void xml_config_read(void) else if (!strcmp((const char *) ptr->name, "retrievalinfo")) { if (yaz_retrieval_configure(gfs->retrieval, ptr)) - { + { yaz_log(YLOG_FATAL, "%s in config %s", yaz_retrieval_get_error(gfs->retrieval), control_block.xml_config); @@ -500,7 +506,7 @@ static void xml_config_open(void) init_control_tls = 1; pthread_key_create(¤t_control_tls, 0); #endif - + gfs_nmem = nmem_create(); #if YAZ_HAVE_XML2 if (control_block.xml_config[0] == '\0') @@ -743,7 +749,7 @@ static void statserv_closedown() /* Allocate the thread handle array */ pThreadHandles = (HANDLE *)malloc(sizeof(HANDLE) * iHandles); - pCurrentHandle = pThreadHandles; + pCurrentHandle = pThreadHandles; for (pCurrentThread = pFirstThread; pCurrentThread != NULL; @@ -782,7 +788,7 @@ void __cdecl event_loop_thread(IOCHAN iochan) } /* WIN32 listener */ -static void listener(IOCHAN h, int event) +static void listener(IOCHAN h, int event) { COMSTACK line = (COMSTACK) iochan_getdata(h); IOCHAN parent_chan = line->user; @@ -840,7 +846,7 @@ static void listener(IOCHAN h, int event) newHandle = (HANDLE) _beginthread(event_loop_thread, 0, new_chan); if (newHandle == (HANDLE) -1) { - + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create new thread."); iochan_destroy(h); return; @@ -862,7 +868,7 @@ static void listener(IOCHAN h, int event) #else /* ! WIN32 */ /* To save having an #ifdef in event_loop we need to - define this empty function + define this empty function */ void statserv_remove(IOCHAN pIOChannel) { @@ -982,7 +988,7 @@ static void *new_session(void *vp) COMSTACK new_line = (COMSTACK) vp; IOCHAN parent_chan = (IOCHAN) new_line->user; - unsigned cs_get_mask, cs_accept_mask, mask = + unsigned cs_get_mask, cs_accept_mask, mask = ((new_line->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) | ((new_line->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0); @@ -1020,7 +1026,7 @@ static void *new_session(void *vp) a = 0; #endif yaz_log_xml_errors(0, YLOG_WARN); - yaz_log(log_session, "Session - OK %d %s %ld", + yaz_log(log_session, "Session - OK %d %s PID=%ld", no_sessions, a ? a : "[Unknown]", (long) getpid()); if (max_sessions && no_sessions >= max_sessions) control_block.one_shot = 1; @@ -1096,8 +1102,8 @@ static int add_listener(char *where, int listen_id) else mode = "static"; - yaz_log(log_server, "Adding %s listener on %s id=%d", mode, where, - listen_id); + yaz_log(log_server, "Adding %s listener on %s id=%d PID=%ld", mode, where, + listen_id, (long) getpid()); l = cs_create_host(where, 2, &ap); if (!l) @@ -1199,6 +1205,14 @@ static void daemon_handler(void *data) iochan_event_loop(pListener); } +#ifndef WIN32 +static void normal_stop_handler(int num) +{ + yaz_log(log_server, "Received SIGTERM. PID=%ld", (long) getpid()); + exit(0); +} +#endif + static int statserv_sc_main(yaz_sc_t s, int argc, char **argv) { char sep; @@ -1224,7 +1238,7 @@ static int statserv_sc_main(yaz_sc_t s, int argc, char **argv) return 1; xml_config_open(); - + xml_config_bend_start(); if (control_block.inetd) @@ -1251,8 +1265,10 @@ static int statserv_sc_main(yaz_sc_t s, int argc, char **argv) return 1; if (s) yaz_sc_running(s); - yaz_log(YLOG_DEBUG, "Entering event loop."); +#ifndef WIN32 + signal(SIGTERM, normal_stop_handler); +#endif yaz_daemon(programname, (control_block.background ? YAZ_DAEMON_FORK : 0), daemon_handler, &pListener, @@ -1272,9 +1288,9 @@ int check_options(int argc, char **argv) int ret = 0, r; char *arg; - yaz_log_init_level(yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL)); + yaz_log_init_level(yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL)); - get_logbits(1); + get_logbits(1); while ((ret = options("1a:iszSTl:v:u:c:w:t:k:Kd:A:p:DC:f:m:r:", argv, argc, &arg)) != -2) @@ -1285,7 +1301,7 @@ int check_options(int argc, char **argv) if (add_listener(arg, 0)) return 1; /* failed to create listener */ break; - case '1': + case '1': control_block.one_shot = 1; control_block.dynamic = 0; break; @@ -1321,7 +1337,7 @@ int check_options(int argc, char **argv) break; case 'v': yaz_log_init_level(yaz_log_mask_str(arg)); - get_logbits(1); + get_logbits(1); break; case 'a': option_copy(control_block.apdufile, arg); @@ -1363,7 +1379,7 @@ int check_options(int argc, char **argv) case 'w': if (chdir(arg)) { - perror(arg); + perror(arg); return 1; } break; @@ -1396,7 +1412,7 @@ int check_options(int argc, char **argv) fprintf(stderr, "Usage: %s [ -a -v " " -l -u -c -t " " -k -d -p -C certfile" - " -ziDST1 -m -w ... ]\n", me); + " -zKiDST1 -m -w ... ]\n", me); return 1; } }