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
Change local counter to size_t
[yaz-moved-to-github.git]
/
src
/
statserv.c
diff --git
a/src/statserv.c
b/src/statserv.c
index
e3b09c5
..
59bb868
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;
@@
-521,9
+520,8
@@
static void xml_config_read(const char *base_path)
}
#endif
}
#endif
-static void xml_config_open(void)
+static int xml_config_open(void)
{
{
- WRBUF base_path;
const char *last_p;
const char *fname = control_block.xml_config;
if (!getcwd(gfs_root_dir, FILENAME_MAX))
const char *last_p;
const char *fname = control_block.xml_config;
if (!getcwd(gfs_root_dir, FILENAME_MAX))
@@
-542,7
+540,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)
{
@@
-550,7
+548,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
{
@@
-559,11
+557,10
@@
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;
}
}
}
}
}
}
- base_path = wrbuf_alloc();
last_p = strrchr(fname,
#ifdef WIN32
'\\'
last_p = strrchr(fname,
#ifdef WIN32
'\\'
@@
-572,12
+569,16
@@
static void xml_config_open(void)
#endif
);
if (last_p)
#endif
);
if (last_p)
+ {
+ WRBUF base_path = wrbuf_alloc();
wrbuf_write(base_path, fname, last_p - fname);
wrbuf_write(base_path, fname, last_p - fname);
+ xml_config_read(wrbuf_cstr(base_path));
+ wrbuf_destroy(base_path);
+ }
else
else
- wrbuf_puts(base_path, ".");
- xml_config_read(wrbuf_cstr(base_path));
- wrbuf_destroy(base_path);
+ xml_config_read(0);
#endif
#endif
+ return 0;
}
static void xml_config_close(void)
}
static void xml_config_close(void)
@@
-600,16
+601,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)
@@
-829,7
+832,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 */
@@
-1077,7
+1080,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
{
@@
-1244,19
+1247,31
@@
static void statserv_reset(void)
{
}
{
}
+static int sig_received = 0;
+
+#ifndef WIN32
+static void normal_stop_handler(int num)
+{
+ sig_received = num;
+}
+#endif
+
static void daemon_handler(void *data)
{
IOCHAN *pListener = data;
static void daemon_handler(void *data)
{
IOCHAN *pListener = data;
- iochan_event_loop(pListener);
+ iochan_event_loop(pListener, &sig_received);
}
}
-#ifndef WIN32
-static void normal_stop_handler(int num)
+static void show_version(void)
{
{
- yaz_log(log_server, "Received SIGTERM. PID=%ld", (long) getpid());
+ char vstr[20], sha1_str[41];
+
+ yaz_version(vstr, sha1_str);
+ printf("YAZ version: %s %s\n", YAZ_VERSION, YAZ_VERSION_SHA1);
+ if (strcmp(sha1_str, YAZ_VERSION_SHA1))
+ printf("YAZ DLL/SO: %s %s\n", vstr, sha1_str);
exit(0);
}
exit(0);
}
-#endif
static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
{
static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
{
@@
-1282,7
+1297,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();
@@
-1296,7
+1312,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);
@@
-1319,6
+1336,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;
}
@@
-1337,7
+1358,7
@@
int check_options(int argc, char **argv)
get_logbits(1);
get_logbits(1);
- while ((ret = options("1a:iszSTl:v:u:c:w:t:k:Kd:A:p:DC:f:m:r:",
+ while ((ret = options("1a:iszSTl:v:u:c:w:t:k:Kd:A:p:DC:f:m:r:V",
argv, argc, &arg)) != -2)
{
switch (ret)
argv, argc, &arg)) != -2)
{
switch (ret)
@@
-1453,11
+1474,14
@@
int check_options(int argc, char **argv)
}
yaz_log_init_max_size(r * 1024);
break;
}
yaz_log_init_max_size(r * 1024);
break;
+ case 'V':
+ show_version();
+ break;
default:
fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
" -l <logfile> -u <user> -c <config> -t <minutes>"
" -k <kilobytes> -d <daemon> -p <pidfile> -C certfile"
default:
fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
" -l <logfile> -u <user> -c <config> -t <minutes>"
" -k <kilobytes> -d <daemon> -p <pidfile> -C certfile"
- " -zKiDST1 -m <time-format> -w <directory> <listener-addr>... ]\n", me);
+ " -zKiDSTV1 -m <time-format> -w <directory> <listener-addr>... ]\n", me);
return 1;
}
}
return 1;
}
}