* cosmetic fixes in the new trace file functionality

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 353cd73d36fb1e2c6417256109177ab5433c55b1..1d879f3db59b883cbe3bf36bd920916976a11950 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.70  2002/01/17 10:48:36  error
+ * cosmetic fixes in the new trace file functionality
+
  Revision 590.69  2002/01/17 10:32:14  error
  * lprintf() now logs the session ID for each log entry within a session.
    Also SMTP, IMAP, POP3 and Citadel protocol commands are differentiated.
@@ -3182,3 +3185,4 @@ 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 a41b91263031ba2bcb78b352f7147885749307d9..b28bb0eef4ca8e9602d90e9cacb54e73a99ccae1 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -206,7 +206,7 @@ void RemoveContext (struct CitContext *con)
 
        rec_log(CL_TERMINATE, con->curr_user);
        unlink(con->temp);
-       lprintf(3, "[%3d] session ended.\n", con->cs_pid);
+       lprintf(3, "[%3d] Session ended.\n", con->cs_pid);
        
 
        syslog(LOG_NOTICE,"session %d: ended", con->cs_pid);
@@ -843,7 +843,7 @@ void begin_session(struct CitContext *con)
        if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
                con->nologin = 1;
 
-       lprintf(3, "[%3d] session started.\n", con->cs_pid);
+       lprintf(3, "Session started.\n");
 
        /* Run any session startup routines registered by loadable modules */
        PerformSessionHooks(EVT_START);

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 9ba5f02871d96cdf93c9086bcb4a582402611c87..7e56a3bac9882028d04524203a23174193f902f7 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -118,7 +118,7 @@ void lprintf(int loglevel, const char *format, ...) {
                 * microsecond accuracy and your OS supports it, change
                 * %03ld to %06ld and remove " / 1000" after tv.tv_usec.
                 */
-               if (CC) {
+               if (CC && CC->cs_pid) {
                        fprintf(stderr,
                                "%04d/%02d/%02d %2d:%02d:%02d.%03ld [%3d] %s",
                                tim->tm_year + 1900, tim->tm_mon + 1,