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
Minor changes to admin client.
[yaz-moved-to-github.git]
/
server
/
statserv.c
diff --git
a/server/statserv.c
b/server/statserv.c
index
0ef6878
..
aab25b6
100644
(file)
--- a/
server/statserv.c
+++ b/
server/statserv.c
@@
-7,7
+7,13
@@
* Chas Woodfield, Fretwell Downing Datasystems.
*
* $Log: statserv.c,v $
* Chas Woodfield, Fretwell Downing Datasystems.
*
* $Log: statserv.c,v $
- * Revision 1.60 2000-03-14 09:06:11 adam
+ * Revision 1.62 2000-03-17 12:47:02 adam
+ * Minor changes to admin client.
+ *
+ * Revision 1.61 2000/03/15 12:59:49 adam
+ * Added handle member to statserv_control.
+ *
+ * Revision 1.60 2000/03/14 09:06:11 adam
* Added POSIX threads support for frontend server.
*
* Revision 1.59 1999/11/30 13:47:12 adam
* Added POSIX threads support for frontend server.
*
* Revision 1.59 1999/11/30 13:47:12 adam
@@
-264,7
+270,8
@@
statserv_options_block control_block = {
check_options, /* Default routine, for checking the run-time arguments */
check_ip_tcpd,
"",
check_options, /* Default routine, for checking the run-time arguments */
check_ip_tcpd,
"",
- 0 /* default value for inet deamon */
+ 0, /* default value for inet deamon */
+ 0, /* handle (for service, etc) */
#ifdef WIN32
,"Z39.50 Server", /* NT Service Name */
#ifdef WIN32
,"Z39.50 Server", /* NT Service Name */
@@
-537,10
+544,20
@@
void statserv_remove(IOCHAN pIOChannel)
void statserv_closedown()
{
IOCHAN p;
void statserv_closedown()
{
IOCHAN p;
+
+ if (control_block.bend_stop)
+ (*control_block.bend_stop)(&control_block);
+
for (p = pListener; p; p = p->next)
iochan_destroy(p);
}
for (p = pListener; p; p = p->next)
iochan_destroy(p);
}
+void sigterm(int sig)
+{
+ statserv_closedown();
+ exit (0);
+}
+
static void *new_session (void *vp);
static void listener(IOCHAN h, int event)
static void *new_session (void *vp);
static void listener(IOCHAN h, int event)
@@
-848,8
+865,10
@@
int statserv_start(int argc, char **argv)
me++;
else
me = argv[0];
me++;
else
me = argv[0];
+ logf (LOG_LOG, "Starting server %s", me);
#else
me = argv[0];
#else
me = argv[0];
+ logf (LOG_LOG, "Starting server %s pid=%d", me, getpid());
#endif
if (control_block.options_func(argc, argv))
return(1);
#endif
if (control_block.options_func(argc, argv))
return(1);
@@
-864,6
+883,7
@@
int statserv_start(int argc, char **argv)
if (control_block.dynamic)
signal(SIGCHLD, catchchld);
}
if (control_block.dynamic)
signal(SIGCHLD, catchchld);
}
+ signal (SIGTERM, sigterm);
if (*control_block.setuid)
{
struct passwd *pw;
if (*control_block.setuid)
{
struct passwd *pw;
@@
-927,6
+947,7
@@
int check_options(int argc, char **argv)
control_block.threads = 1;
#else
fprintf(stderr, "%s: Threaded mode not available.\n", me);
control_block.threads = 1;
#else
fprintf(stderr, "%s: Threaded mode not available.\n", me);
+ return 1;
#endif
break;
case 'l':
#endif
break;
case 'l':
@@
-972,7
+993,7
@@
int check_options(int argc, char **argv)
if (chdir(arg))
{
perror(arg);
if (chdir(arg))
{
perror(arg);
- return(1);
+ return 1;
}
break;
default:
}
break;
default:
@@
-980,7
+1001,7
@@
int check_options(int argc, char **argv)
" -l <logfile> -u <user> -c <config> -t <minutes>"
" -k <kilobytes> -d <daemon>"
" -zsiST -w <directory> <listender-addr>... ]\n", me);
" -l <logfile> -u <user> -c <config> -t <minutes>"
" -k <kilobytes> -d <daemon>"
" -zsiST -w <directory> <listender-addr>... ]\n", me);
- return(1);
+ return 1;
}
}
return 0;
}
}
return 0;