From: <jgd...@us...> - 2004-10-06 18:50:41
|
Update of /cvsroot/aolserver/aolserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7734/nsd Modified Files: log.c nsmain.c Log Message: Ns_Fatal now calls abort() in debug mode. Index: log.c =================================================================== RCS file: /cvsroot/aolserver/aolserver/nsd/log.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** log.c 23 Jun 2004 15:18:59 -0000 1.26 --- log.c 6 Oct 2004 18:50:29 -0000 1.27 *************** *** 219,222 **** --- 219,225 ---- Log(Fatal, fmt, ap); va_end(ap); + if (nsconf.debug) { + abort(); + } _exit(1); } Index: nsmain.c =================================================================== RCS file: /cvsroot/aolserver/aolserver/nsd/nsmain.c,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** nsmain.c 21 Sep 2004 00:47:20 -0000 1.58 --- nsmain.c 6 Oct 2004 18:50:29 -0000 1.59 *************** *** 85,89 **** uid_t uid = 0; gid_t gid = 0; - int debug = 0; int mode = 0; char *root = NULL; --- 85,88 ---- *************** *** 229,233 **** break; case 'd': ! debug = 1; break; case 'g': --- 228,232 ---- break; case 'd': ! nsconf.debug = 1; break; case 'g': *************** *** 425,429 **** */ ! NsBlockSignals(debug); #endif --- 424,428 ---- */ ! NsBlockSignals(nsconf.debug); #endif *************** *** 667,674 **** --- 666,675 ---- NsStartSchedShutdown(); NsStartSockShutdown(); + NsStartQueueShutdown(); NsStartJobsShutdown(); NsStartShutdownProcs(); NsWaitSchedShutdown(&timeout); NsWaitSockShutdown(&timeout); + NsWaitQueueShutdown(&timeout); NsWaitJobsShutdown(&timeout); NsWaitDriversShutdown(&timeout); |