From: Art Cancro <ajc@citadel.org>
Date: Thu, 17 Mar 2011 03:07:23 +0000 (-0400)
Subject: more logging and testing
X-Git-Tag: v8.11~819
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=cdb76f6e9aafb137b3969f96ad1731e19e534fe0

more logging and testing
---

diff --git a/citadel/context.c b/citadel/context.c
index 0b545139b..70657537e 100644
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -334,8 +334,7 @@ void RemoveContext (CitContext *con)
 {
 	const char *c;
 	if (con==NULL) {
-		syslog(LOG_ERR,
-			"WARNING: RemoveContext() called with NULL!\n");
+		syslog(LOG_ERR, "WARNING: RemoveContext() called with NULL!\n");
 		return;
 	}
 	c = con->ServiceName;
@@ -362,7 +361,7 @@ void RemoveContext (CitContext *con)
 	if (con->client_socket != 0)
 	{
 		syslog(LOG_DEBUG, "Closing socket %d\n", con->client_socket);
-		close(con->client_socket);
+		if (close(con->client_socket)) syslog(LOG_NOTICE, "close() : %s", strerror(errno));
 	}
 
 	/* If using AUTHMODE_LDAP, free the DN */
diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 7eefb54eb..d7f88ad4d 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -778,7 +778,9 @@ void CtdlUserLogout(void)
 {
 	CitContext *CCC = MyContext();
 
-	syslog(LOG_DEBUG, "CtdlUserLogout() logging out <%s>\n", CCC->curr_user);
+	syslog(LOG_DEBUG, "CtdlUserLogout() logging out <%s> from session %d",
+		CCC->curr_user, CCC->cs_pid
+	);
 
 	/*
 	 * If there is a download in progress, abort it.