From 25769130cb924d9d3339cd57ba55327c6449d037 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 27 Oct 2009 06:03:16 +0000
Subject: [PATCH] Change "threads remain" log entry (when servers terminate)
from error to warning log level. Added more debug log output.
---
src/sbbs3/ftpsrvr.c | 2 +-
src/sbbs3/mailsrvr.c | 3 ++-
src/sbbs3/main.cpp | 3 ++-
src/sbbs3/websrvr.c | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c
index 5d8c9d329c..c6589d59aa 100644
--- a/src/sbbs3/ftpsrvr.c
+++ b/src/sbbs3/ftpsrvr.c
@@ -4590,7 +4590,7 @@ static void cleanup(int code, int line)
if(terminate_server || code)
lprintf(LOG_INFO,"#### FTP Server thread terminated (%lu clients served)", served);
if(thread_count)
- lprintf(LOG_ERR,"#### !FTP Server threads (%u) remain active after termination", thread_count);
+ lprintf(LOG_WARNING,"#### !FTP Server threads (%u) remain after termination", thread_count);
if(startup!=NULL && startup->terminated!=NULL)
startup->terminated(startup->cbdata,code);
}
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index dde736617f..333a0d0810 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -2371,6 +2371,7 @@ static void smtp_thread(void* arg)
srand(time(NULL) ^ (DWORD)GetCurrentThreadId()); /* seed random number generator */
rand(); /* throw-away first result */
SAFEPRINTF4(session_id,"%x%x%x%lx",getpid(),socket,rand(),clock());
+ lprintf(LOG_DEBUG,"%04d SMTP Session ID=%s", socket, session_id);
SAFEPRINTF2(msgtxt_fname,"%sSBBS_SMTP.%s.msg", scfg.temp_dir, session_id);
SAFEPRINTF2(newtxt_fname,"%sSBBS_SMTP.%s.new", scfg.temp_dir, session_id);
SAFEPRINTF2(logtxt_fname,"%sSBBS_SMTP.%s.log", scfg.temp_dir, session_id);
@@ -4628,7 +4629,7 @@ static void cleanup(int code)
lprintf(LOG_INFO,"#### Mail Server thread terminated (%s)",str);
}
if(thread_count)
- lprintf(LOG_ERR,"#### !Mail Server threads (%u) remain active after termination", thread_count);
+ lprintf(LOG_WARNING,"#### !Mail Server threads (%u) remain after termination", thread_count);
if(startup!=NULL && startup->terminated!=NULL)
startup->terminated(startup->cbdata,code);
}
diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index ac4c7afa76..6e8bc56224 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -4264,7 +4264,7 @@ static void cleanup(int code)
if(terminate_server || code)
lprintf(LOG_INFO,"Terminal Server thread terminated (%lu clients served)", served);
if(thread_count)
- lprintf(LOG_ERR,"!Terminal Server threads (%u) remain active after termination", thread_count);
+ lprintf(LOG_WARNING,"!Terminal Server threads (%u) remain after termination", thread_count);
if(startup->terminated!=NULL)
startup->terminated(startup->cbdata,code);
}
@@ -4849,6 +4849,7 @@ NO_SSH:
}
sbbs->online=FALSE;
+ sbbs->client_socket=INVALID_SOCKET;
#ifdef USE_CRYPTLIB
sbbs->ssh_mode=false;
#endif
diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c
index ac28ad75f8..ddb5ad5a74 100644
--- a/src/sbbs3/websrvr.c
+++ b/src/sbbs3/websrvr.c
@@ -5182,7 +5182,7 @@ static void cleanup(int code)
if(terminate_server || code)
lprintf(LOG_INFO,"#### Web Server thread terminated (%lu clients served)", served);
if(thread_count)
- lprintf(LOG_ERR,"#### !Web Server threads (%u) remain active after termination", thread_count);
+ lprintf(LOG_WARNING,"#### !Web Server threads (%u) remain after termination", thread_count);
if(startup!=NULL && startup->terminated!=NULL)
startup->terminated(startup->cbdata,code);
}
--
GitLab