Skip to content
Snippets Groups Projects
Commit 8fe9b03c authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Log output improvements 

- include client protocol (HTTP or HTTPS) and IP address in more log messages
- include some more detail (e.g. send byte count) in "ERROR sending" message
- lower severity of "Executing FastCGI" log message from Info to Debug
parent ad63d6da
No related branches found
No related tags found
No related merge requests found
Pipeline #9007 passed
Stage: build
Stage: test
Stage: cleanup
Show whitespace changes
Inline Side-by-side
Showing
with 16 additions and 12 deletions
src/sbbs3/websrvr.c
+ 16
− 12
View file @ 8fe9b03c
...@@ -706,22 +706,22 @@ static int sess_sendbuf(http_session_t *session, const char *buf, size_t len, vo ...@@ -706,22 +706,22 @@ static int sess_sendbuf(http_session_t *session, const char *buf, size_t len, vo
result = sendsocket(session->socket, buf + sent, len - sent); result = sendsocket(session->socket, buf + sent, len - sent);
if (result == SOCKET_ERROR) { if (result == SOCKET_ERROR) {
if (SOCKET_ERRNO == ECONNRESET) if (SOCKET_ERRNO == ECONNRESET)
lprintf(LOG_NOTICE, "%04d Connection reset by peer on send", session->socket); lprintf(LOG_NOTICE, "%04d %s [%s] Connection reset by peer on send", session->socket, session->client.protocol, session->host_ip);
else if (SOCKET_ERRNO == ECONNABORTED) else if (SOCKET_ERRNO == ECONNABORTED)
lprintf(LOG_NOTICE, "%04d Connection aborted by peer on send", session->socket); lprintf(LOG_NOTICE, "%04d %s [%s] Connection aborted by peer on send", session->socket, session->client.protocol, session->host_ip);
#ifdef EPIPE #ifdef EPIPE
else if (SOCKET_ERRNO == EPIPE) else if (SOCKET_ERRNO == EPIPE)
lprintf(LOG_NOTICE, "%04d Unable to send to peer", session->socket); lprintf(LOG_NOTICE, "%04d %s [%s] Unable to send to peer", session->socket, session->client.protocol, session->host_ip);
#endif #endif
else if (session->socket != INVALID_SOCKET) else if (session->socket != INVALID_SOCKET)
lprintf(LOG_WARNING, "%04d !ERROR %d sending on socket", session->socket, SOCKET_ERRNO); lprintf(LOG_WARNING, "%04d %s [%s] !ERROR %d sending on socket", session->socket, session->client.protocol, session->host_ip, SOCKET_ERRNO);
*failed = true; *failed = true;
return sent; return sent;
} }
} }
} }
else { else {
lprintf(LOG_WARNING, "%04d Timeout waiting for socket to become writable", session->socket); lprintf(LOG_WARNING, "%04d %s [%s] Timeout waiting for socket to become writable", session->socket, session->client.protocol, session->host_ip);
*failed = true; *failed = true;
return sent; return sent;
} }
...@@ -1541,8 +1541,10 @@ static off_t sock_sendfile(http_session_t *session, char *path, off_t start, off ...@@ -1541,8 +1541,10 @@ static off_t sock_sendfile(http_session_t *session, char *path, off_t start, off
remain = -1L; remain = -1L;
} }
while ((i = read(file, buf, (size_t)(remain > sizeof(buf)?sizeof(buf):remain))) > 0) { while ((i = read(file, buf, (size_t)(remain > sizeof(buf)?sizeof(buf):remain))) > 0) {
if (writebuf(session, buf, i) != i) { int wr = writebuf(session, buf, i);
lprintf(LOG_WARNING, "%04d !ERROR sending %s", session->socket, path); if (wr != i) {
lprintf(LOG_WARNING, "%04d %s [%s] !ERROR sending %s (sent %d instead of %d bytes)"
,session->socket, session->client.protocol, session->host_ip, path, wr, (int)i);
close(file); close(file);
return 0; return 0;
} }
...@@ -2242,7 +2244,8 @@ static int sockreadline(http_session_t * session, char *buf, size_t length) ...@@ -2242,7 +2244,8 @@ static int sockreadline(http_session_t * session, char *buf, size_t length)
} }
else { else {
/* Timeout */ /* Timeout */
lprintf(LOG_NOTICE, "%04d Session timeout due to inactivity (%d seconds)", session->socket, startup->max_inactivity); lprintf(LOG_NOTICE, "%04d %s [%s] Session timeout due to inactivity (%d seconds)"
, session->socket, session->client.protocol, session->host_ip, startup->max_inactivity);
return -1; return -1;
} }
} }
...@@ -2252,7 +2255,8 @@ static int sockreadline(http_session_t * session, char *buf, size_t length) ...@@ -2252,7 +2255,8 @@ static int sockreadline(http_session_t * session, char *buf, size_t length)
if (session->is_tls || SOCKET_ERRNO != EAGAIN) { if (session->is_tls || SOCKET_ERRNO != EAGAIN) {
if (!session->is_tls) { if (!session->is_tls) {
if (startup->options & WEB_OPT_DEBUG_RX) if (startup->options & WEB_OPT_DEBUG_RX)
lprintf(LOG_DEBUG, "%04d !ERROR %d receiving on socket", session->socket, SOCKET_ERRNO); lprintf(LOG_DEBUG, "%04d %s [%s] !ERROR %d receiving on socket"
, session->socket, session->client.protocol, session->host_ip, SOCKET_ERRNO);
} }
close_session_socket(session); close_session_socket(session);
return -1; return -1;
...@@ -2283,9 +2287,9 @@ static int sockreadline(http_session_t * session, char *buf, size_t length) ...@@ -2283,9 +2287,9 @@ static int sockreadline(http_session_t * session, char *buf, size_t length)
buf[i] = 0; buf[i] = 0;
if (startup->options & WEB_OPT_DEBUG_RX) { if (startup->options & WEB_OPT_DEBUG_RX) {
lprintf(LOG_DEBUG, "%04d RX: %s", session->socket, buf); lprintf(LOG_DEBUG, "%04d %s [%s] RX: %s", session->socket, session->client.protocol, session->host_ip, buf);
if (chucked) if (chucked)
lprintf(LOG_DEBUG, "%04d Long header, chucked %d bytes", session->socket, chucked); lprintf(LOG_DEBUG, "%04d %s [%s] Long header, chucked %d bytes", session->socket, session->client.protocol, session->host_ip, chucked);
} }
return i; return i;
} }
...@@ -4876,7 +4880,7 @@ static bool exec_fastcgi(http_session_t *session) ...@@ -4876,7 +4880,7 @@ static bool exec_fastcgi(http_session_t *session)
.arg = &cd .arg = &cd
}; };
lprintf(LOG_INFO, "%04d %s [%s] Executing FastCGI: %s", session->socket, session->client.protocol, session->host_ip, session->req.physical_path); lprintf(LOG_DEBUG, "%04d %s [%s] Executing FastCGI: %s", session->socket, session->client.protocol, session->host_ip, session->req.physical_path);
if (session->req.fastcgi_socket == NULL) { if (session->req.fastcgi_socket == NULL) {
errprintf(LOG_ERR, WHERE, "%04d No FastCGI socket configured!", session->socket); errprintf(LOG_ERR, WHERE, "%04d No FastCGI socket configured!", session->socket);
return false; return false;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment