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

Use errprintf for FastCGI related error log messages 

I received 6853 duplicate FastCGI error emails today (sent in a 2 minute
time span). I wish I already had this in place. :-(
parent d74fafdc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 15 additions and 15 deletions
src/sbbs3/websrvr.c
+ 15
− 15
View file @ 196ad130
...@@ -4099,7 +4099,7 @@ static SOCKET fastcgi_connect(const char *orig_path, SOCKET client_sock) ...@@ -4099,7 +4099,7 @@ static SOCKET fastcgi_connect(const char *orig_path, SOCKET client_sock)
hints.ai_flags = AI_ADDRCONFIG; hints.ai_flags = AI_ADDRCONFIG;
result = getaddrinfo(path, port, &hints, &res); result = getaddrinfo(path, port, &hints, &res);
if(result != 0) { if(result != 0) {
lprintf(LOG_ERR, "%04d ERROR resolving FastCGI address %s port %s", client_sock, path, port); errprintf(LOG_ERR, WHERE, "%04d ERROR resolving FastCGI address %s port %s", client_sock, path, port);
free(path); free(path);
return INVALID_SOCKET; return INVALID_SOCKET;
} }
...@@ -4128,7 +4128,7 @@ static SOCKET fastcgi_connect(const char *orig_path, SOCKET client_sock) ...@@ -4128,7 +4128,7 @@ static SOCKET fastcgi_connect(const char *orig_path, SOCKET client_sock)
freeaddrinfo(res); freeaddrinfo(res);
} }
if(sock == INVALID_SOCKET) { if(sock == INVALID_SOCKET) {
lprintf(LOG_ERR, "%04d ERROR unable to make FastCGI connection to %s", client_sock, orig_path); errprintf(LOG_ERR, WHERE, "%04d ERROR unable to make FastCGI connection to %s", client_sock, orig_path);
free(path); free(path);
return sock; return sock;
} }
...@@ -4228,7 +4228,7 @@ static bool fastcgi_send_params(SOCKET sock, http_session_t *session) ...@@ -4228,7 +4228,7 @@ static bool fastcgi_send_params(SOCKET sock, http_session_t *session)
if (end > 32000) { if (end > 32000) {
msg->head.len = htons((uint16_t)end); msg->head.len = htons((uint16_t)end);
if (sendsocket(sock, (void *)msg, sizeof(struct fastcgi_header) + end) != (sizeof(struct fastcgi_header) + end)) { if (sendsocket(sock, (void *)msg, sizeof(struct fastcgi_header) + end) != (sizeof(struct fastcgi_header) + end)) {
lprintf(LOG_ERR, "%04d ERROR sending FastCGI params", session->socket); errprintf(LOG_ERR, WHERE, "%04d ERROR sending FastCGI params", session->socket);
free(msg); free(msg);
strListFree(&env); strListFree(&env);
return false; return false;
...@@ -4240,7 +4240,7 @@ static bool fastcgi_send_params(SOCKET sock, http_session_t *session) ...@@ -4240,7 +4240,7 @@ static bool fastcgi_send_params(SOCKET sock, http_session_t *session)
if (end) { if (end) {
msg->head.len = htons((uint16_t)end); msg->head.len = htons((uint16_t)end);
if (sendsocket(sock, (void *)msg, sizeof(struct fastcgi_header) + end) != (sizeof(struct fastcgi_header) + end)) { if (sendsocket(sock, (void *)msg, sizeof(struct fastcgi_header) + end) != (sizeof(struct fastcgi_header) + end)) {
lprintf(LOG_ERR, "%04d ERROR sending FastCGI params", session->socket); errprintf(LOG_ERR, WHERE, "%04d ERROR sending FastCGI params", session->socket);
free(msg); free(msg);
return false; return false;
} }
...@@ -4248,7 +4248,7 @@ static bool fastcgi_send_params(SOCKET sock, http_session_t *session) ...@@ -4248,7 +4248,7 @@ static bool fastcgi_send_params(SOCKET sock, http_session_t *session)
} }
msg->head.len = htons((uint16_t)end); msg->head.len = htons((uint16_t)end);
if (sendsocket(sock, (void *)msg, sizeof(struct fastcgi_header) + end) != (sizeof(struct fastcgi_header) + end)) { if (sendsocket(sock, (void *)msg, sizeof(struct fastcgi_header) + end) != (sizeof(struct fastcgi_header) + end)) {
lprintf(LOG_ERR, "%04d ERROR sending FastCGI params", session->socket); errprintf(LOG_ERR, WHERE, "%04d ERROR sending FastCGI params", session->socket);
free(msg); free(msg);
return false; return false;
} }
...@@ -4283,19 +4283,19 @@ static struct fastcgi_body * fastcgi_read_body(SOCKET sock) ...@@ -4283,19 +4283,19 @@ static struct fastcgi_body * fastcgi_read_body(SOCKET sock)
if (recv(sock, (char*)&header.len if (recv(sock, (char*)&header.len
,sizeof(header) - offsetof(struct fastcgi_header, len), MSG_WAITALL) ,sizeof(header) - offsetof(struct fastcgi_header, len), MSG_WAITALL)
!= sizeof(header) - offsetof(struct fastcgi_header, len)) { != sizeof(header) - offsetof(struct fastcgi_header, len)) {
lprintf(LOG_ERR, "Error reading FastCGI message header"); errprintf(LOG_ERR, WHERE, "Error reading FastCGI message header");
return NULL; return NULL;
} }
body = (struct fastcgi_body *)malloc(offsetof(struct fastcgi_body, data) + htons(header.len)); body = (struct fastcgi_body *)malloc(offsetof(struct fastcgi_body, data) + htons(header.len));
body->len = htons(header.len); body->len = htons(header.len);
if (recv(sock, body->data, body->len, MSG_WAITALL) != body->len) { if (recv(sock, body->data, body->len, MSG_WAITALL) != body->len) {
free(body); free(body);
lprintf(LOG_ERR, "Error reading FastCGI message"); errprintf(LOG_ERR, WHERE, "Error reading FastCGI message");
return NULL; return NULL;
} }
if (recv(sock, padding, header.padlen, MSG_WAITALL) != header.padlen) { if (recv(sock, padding, header.padlen, MSG_WAITALL) != header.padlen) {
free(body); free(body);
lprintf(LOG_ERR, "Error reading FastCGI padding"); errprintf(LOG_ERR, WHERE, "Error reading FastCGI padding");
return NULL; return NULL;
} }
return body; return body;
...@@ -4320,15 +4320,15 @@ static int fastcgi_read_wait_timeout(void *arg) ...@@ -4320,15 +4320,15 @@ static int fastcgi_read_wait_timeout(void *arg)
if (socket_readable(cd->sock, startup->max_cgi_inactivity*1000)) { if (socket_readable(cd->sock, startup->max_cgi_inactivity*1000)) {
if (recv(cd->sock, (void *)&cd->header, offsetof(struct fastcgi_header, len), MSG_WAITALL) != offsetof(struct fastcgi_header, len)) { if (recv(cd->sock, (void *)&cd->header, offsetof(struct fastcgi_header, len), MSG_WAITALL) != offsetof(struct fastcgi_header, len)) {
lprintf(LOG_ERR, "FastCGI failed to read header"); errprintf(LOG_ERR, WHERE, "FastCGI failed to read header");
return ret; return ret;
} }
if (cd->header.ver != FCGI_VERSION_1) { if (cd->header.ver != FCGI_VERSION_1) {
lprintf(LOG_ERR, "Unknown FastCGI version %d", cd->header.ver); errprintf(LOG_ERR, WHERE, "Unknown FastCGI version %d", cd->header.ver);
return ret; return ret;
} }
if (htons(cd->header.id) != 1) { if (htons(cd->header.id) != 1) {
lprintf(LOG_ERR, "Unknown FastCGI session ID %d", htons(cd->header.id)); errprintf(LOG_ERR, WHERE, "Unknown FastCGI session ID %d", htons(cd->header.id));
return ret; return ret;
} }
switch(cd->header.type) { switch(cd->header.type) {
...@@ -4357,7 +4357,7 @@ static int fastcgi_read_wait_timeout(void *arg) ...@@ -4357,7 +4357,7 @@ static int fastcgi_read_wait_timeout(void *arg)
free(body); free(body);
break; break;
default: default:
lprintf(LOG_ERR, "Unhandled FastCGI message type %d", cd->header.type); errprintf(LOG_ERR, WHERE, "Unhandled FastCGI message type %d", cd->header.type);
// Read and discard the entire message... // Read and discard the entire message...
body = fastcgi_read_body(cd->sock); body = fastcgi_read_body(cd->sock);
if (body == NULL) if (body == NULL)
...@@ -4866,7 +4866,7 @@ static bool exec_fastcgi(http_session_t *session) ...@@ -4866,7 +4866,7 @@ static bool exec_fastcgi(http_session_t *session)
lprintf(LOG_INFO,"%04d %s [%s] Executing FastCGI: %s",session->socket, session->client.protocol, session->host_ip, session->req.physical_path); lprintf(LOG_INFO,"%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) {
lprintf(LOG_ERR, "%04d No FastCGI socket configured!",session->socket); errprintf(LOG_ERR, WHERE, "%04d No FastCGI socket configured!",session->socket);
return false; return false;
} }
...@@ -4882,7 +4882,7 @@ static bool exec_fastcgi(http_session_t *session) ...@@ -4882,7 +4882,7 @@ static bool exec_fastcgi(http_session_t *session)
msg = (struct fastcgi_message *)malloc(msglen); msg = (struct fastcgi_message *)malloc(msglen);
if (msg == NULL) { if (msg == NULL) {
closesocket(sock); closesocket(sock);
lprintf(LOG_ERR, "%04d Failure to allocate memory for FastCGI message!", session->socket); errprintf(LOG_ERR, WHERE, "%04d Failure to allocate memory for FastCGI message!", session->socket);
return false; return false;
} }
fastcgi_init_header(&msg->head, FCGI_BEGIN_REQUEST); fastcgi_init_header(&msg->head, FCGI_BEGIN_REQUEST);
...@@ -4893,7 +4893,7 @@ static bool exec_fastcgi(http_session_t *session) ...@@ -4893,7 +4893,7 @@ static bool exec_fastcgi(http_session_t *session)
memset(br->reserved, 0, sizeof(br->reserved)); memset(br->reserved, 0, sizeof(br->reserved));
int result = sendsocket(sock, (void *)msg, msglen); int result = sendsocket(sock, (void *)msg, msglen);
if (result != msglen) { if (result != msglen) {
lprintf(LOG_ERR, "%04d %s [%s] !ERROR %d sending %d bytes to FastCGI socket (send returned %d)" errprintf(LOG_ERR, WHERE, "%04d %s [%s] !ERROR %d sending %d bytes to FastCGI socket (send returned %d)"
,session->socket, session->client.protocol, session->host_ip, SOCKET_ERRNO, msglen, result); ,session->socket, session->client.protocol, session->host_ip, SOCKET_ERRNO, msglen, result);
free(msg); free(msg);
closesocket(sock); closesocket(sock);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment