* Minor enhancements to a few of the trace file entries

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index f116bd613f17dde73f89c2ec1f3207ed017f2dfc..cc4e2885f28d6902991d6e9f826ce52bc6fd4759 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 612.4  2003/12/07 19:59:13  error
+ * Minor enhancements to a few of the trace file entries
+
  Revision 612.3  2003/12/07 19:57:48  error
  * Added some useless comments to some of the techdocs/ files
 
@@ -5108,4 +5111,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 0769cecf8ca3125254502702b7f82ef2269a76c3..6b8c3936925b5673f19d0c8787030f730676f7d1 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -181,11 +181,11 @@ void RemoveContext (struct CitContext *con)
        struct CitContext *ptr = NULL;
        struct CitContext *ToFree = NULL;
 
-       lprintf(9, "RemoveContext() called\n");
        if (con==NULL) {
                lprintf(5, "WARNING: RemoveContext() called with NULL!\n");
                return;
        }
+       lprintf(9, "RemoveContext() called\n");
 
        /* Remove the context from the global context list.  This needs
         * to get done FIRST to avoid concurrency problems.  It is *vitally*
@@ -229,7 +229,7 @@ void RemoveContext (struct CitContext *con)
        logout(con);
 
        unlink(con->temp);
-       lprintf(3, "[%3d] Session ended.\n", con->cs_pid);
+       lprintf(3, "Session ended.\n");
        syslog(LOG_NOTICE,"Session %d: ended.", con->cs_pid);
 
        /* Deallocate any user-data attached to this session */
@@ -244,7 +244,7 @@ void RemoveContext (struct CitContext *con)
        /* Free up the memory used by this context */
        phree(con);
 
-       lprintf(7, "Done with RemoveContext()\n");
+       lprintf(9, "Done with RemoveContext()\n");
 }
 
 
@@ -507,14 +507,14 @@ void cmd_iden(char *argbuf)
                }
        }
 
-       lprintf(7, "client %d/%d/%01d.%02d (%s)\n",
+       lprintf(7, "Client %d/%d/%01d.%02d (%s)\n",
                dev_code,
                cli_code,
                (rev_level / 100),
                (rev_level % 100),
                desc);
 
-       syslog(LOG_NOTICE,"session %d: client %d/%d/%01d.%02d (%s) from %s\n",
+       syslog(LOG_NOTICE,"Session %d: Client %d/%d/%01d.%02d (%s) from %s\n",
                CC->cs_pid,
                dev_code,
                cli_code,

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 5ea001912ac3ff37d26b770e67da7185ac85ed99..c6b7bbdd97aa22e22a7f03d95ca13d22dd591116 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -85,7 +85,7 @@ int sock_connect(char *host, char *service, char *protocol)
        }
 
        if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
-               lprintf(3, "can't connect to %s:%s: %s\n",
+               lprintf(3, "Can't connect to %s:%s: %s\n",
                        host, service, strerror(errno));
                close(s);
                return(-1);

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 11c7b634c3580b90d8dd06b2c488f576360fd290..e6d3832ede196e44fde4e5bc24907f3f40331b1e 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1977,7 +1977,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        }
 
        /* Goto the correct room */
-       lprintf(9, "Switching rooms\n");
+       lprintf(9, "Selected room %s\n", (recps) ? CC->room.QRname : SENTITEMS);
        strcpy(hold_rm, CC->room.QRname);
        strcpy(actual_rm, CC->room.QRname);
        if (recps != NULL) {
@@ -1985,7 +1985,8 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        }
 
        /* If the user is a twit, move to the twit room for posting */
-       lprintf(9, "Handling twit stuff\n");
+       lprintf(9, "Handling twit stuff: %s\n",
+                       (CC->user.axlevel == 2) ? config.c_twitroom : "OK");
        if (TWITDETECT) {
                if (CC->user.axlevel == 2) {
                        strcpy(hold_rm, actual_rm);
@@ -1998,7 +1999,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
                strcpy(actual_rm, force_room);
        }
 
-       lprintf(9, "Possibly relocating\n");
+       lprintf(9, "Final selection: %s\n", actual_rm);
        if (strcasecmp(actual_rm, CC->room.QRname)) {
                getroom(&CC->room, actual_rm);
        }
@@ -2133,7 +2134,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        }
 
        /* Go back to the room we started from */
-       lprintf(9, "Returning to original room\n");
+       lprintf(9, "Returning to original room %s\n", hold_rm);
        if (strcasecmp(hold_rm, CC->room.QRname))
                getroom(&CC->room, hold_rm);
 

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 4a7206ec2a1a8c7be7dbcce3af86da121d998317..10b61cf590ed3251e1898e19f7ecd11eff16f7a2 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
 
        /* Tell 'em who's in da house */
        lprintf(1,
-               "\n*** Citadel/UX messaging server engine v%d.%02d ***\n"
+               "\n\n*** Citadel/UX messaging server engine v%d.%02d ***\n"
                "Copyright (C) 1987-2003 by the Citadel/UX development team.\n"
                "This program is distributed under the terms of the GNU "
                "General Public License.\n\n",