---------------------
PatchSet 205 
Date: 2002/11/27 14:00:50
Author: rbcollins
Branch: external_logger
Tag: (none) 
Log:
fixup merge failures

Members: 
	src/Makefile.am:1.10.4.1->1.10.4.2 
	src/ipc.cc:1.5.4.1->1.5.4.2 

Index: squid3/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -u -r1.10.4.1 -r1.10.4.2
--- squid3/src/Makefile.am	27 Nov 2002 02:37:12 -0000	1.10.4.1
+++ squid3/src/Makefile.am	27 Nov 2002 14:00:50 -0000	1.10.4.2
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.10.4.1 2002/11/27 02:37:12 rbcollins Exp $
+#  $Id: Makefile.am,v 1.10.4.2 2002/11/27 14:00:50 rbcollins Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -315,6 +315,7 @@
 DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
 DEFAULT_PID_FILE        = $(DEFAULT_LOG_PREFIX)/squid.pid
 DEFAULT_SWAP_DIR        = $(localstatedir)/cache
+DEFAULT_LOGD		= $(libexecdir)/logd$(EXEEXT)
 DEFAULT_PINGER		= $(libexecdir)/pinger$(EXEEXT)
 DEFAULT_UNLINKD		= $(libexecdir)/unlinkd$(EXEEXT)
 DEFAULT_DISKD		= $(libexecdir)/diskd$(EXEEXT)
@@ -360,6 +361,7 @@
 	sed "\
 	s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
 	s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
+	s%@DEFAULT_LOGD@%$(DEFAULT_LOGD)%g;\
 	s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\
 	s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g;\
 	s%@DEFAULT_DISKD@%$(DEFAULT_DISKD)%g;\
Index: squid3/src/ipc.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ipc.cc,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- squid3/src/ipc.cc	27 Nov 2002 02:37:12 -0000	1.5.4.1
+++ squid3/src/ipc.cc	27 Nov 2002 14:00:50 -0000	1.5.4.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipc.cc,v 1.5.4.1 2002/11/27 02:37:12 rbcollins Exp $
+ * $Id: ipc.cc,v 1.5.4.2 2002/11/27 14:00:50 rbcollins Exp $
  *
  * DEBUG: section 54    Interprocess Communication
  * AUTHOR: Duane Wessels
@@ -327,6 +327,7 @@
 int
 ipcCreateOneWay(int type, const char *prog, char *const args[], const char *name, int ipcout, ipc_comm *ipccomm)
 {
+    debug (50,2)("ipcCreateOneWay: %s\n", prog);
     pid_t pid;
     struct sockaddr_in CS;
     struct sockaddr_in PS;
@@ -542,7 +543,7 @@
 	t3 = dup(fileno(debug_log));
     else
 	t3 = dup(cachelog->logfd);
-    debug(1,1)("cachelog is %p t1 %d t2 %d t3 %d\n",cachelog, t1,t2,t3);
+    debug(1,1)("cachelog is %p crfd %d ipcout %d cachelog/debuglog %d\n",cachelog, t1,t2,t3);
     assert(t1 > 2 && t2 > 2 && t3 > 2);
     close(crfd);
     close(cwfd);
@@ -609,11 +610,15 @@
     ipc_quit_handler *handler;
     dlink_node *node;
     node = ipc_quit_handlers.head;
+    bool calledOne = false;
     while (node) {
 	handler = (ipc_quit_handler *)node->data;
 	if (handler->pid == pid) {
 	    handler->event (handler->data);
+	    calledOne = true;
 	}
 	node = node->next;
     }
+    if (!calledOne)
+	debug (50,2)("ipcCallQuitHandlers: No handler found for pid %d\n", pid);
 }