more logging and testing

diff --git a/citadel/context.c b/citadel/context.c
index 0b545139b0998a7a32e7dba2c0807ae0f30b5be8..70657537ec02e20248dfb7467b4f1005d67fa037 100644 (file)
--- 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 7eefb54eb8240359e8c70aef6d4b1c007db17f99..d7f88ad4dc79e1fa94d39d00a69044925db64bd2 100644 (file)
--- 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.