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

A little clean-up around FILE* opening/closing, error handling 

"HTTP Logging" replaced in log messages with "Web Server access-logging".

Using new FCLOSE_OPEN_FILE macro to close and NULify open FILE*'s.
parent 07a0cc3e
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #4915 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 59 additions and 61 deletions
src/sbbs3/websrvr.c
+ 59
− 61
View file @ 274efc58
...@@ -1044,7 +1044,7 @@ static void drain_outbuf(http_session_t * session) ...@@ -1044,7 +1044,7 @@ static void drain_outbuf(http_session_t * session)
return; return;
/* Force the output thread to go NOW */ /* Force the output thread to go NOW */
SetEvent(session->outbuf.highwater_event); SetEvent(session->outbuf.highwater_event);
/* ToDo: This should probobly timeout eventually... */ /* ToDo: This should probably timeout eventually... */
while(RingBufFull(&session->outbuf) && session->socket!=INVALID_SOCKET) { while(RingBufFull(&session->outbuf) && session->socket!=INVALID_SOCKET) {
SetEvent(session->outbuf.highwater_event); SetEvent(session->outbuf.highwater_event);
SLEEP(1); SLEEP(1);
...@@ -1135,8 +1135,7 @@ static void close_request(http_session_t * session) ...@@ -1135,8 +1135,7 @@ static void close_request(http_session_t * session)
if(session->subscan!=NULL) if(session->subscan!=NULL)
putmsgptrs(&scfg, &session->user, session->subscan); putmsgptrs(&scfg, &session->user, session->subscan);
if(session->req.fp!=NULL) FCLOSE_OPEN_FILE(session->req.fp);
fclose(session->req.fp);
for(i=0;i<MAX_CLEANUPS;i++) { for(i=0;i<MAX_CLEANUPS;i++) {
if(session->req.cleanup_file[i]!=NULL) { if(session->req.cleanup_file[i]!=NULL) {
...@@ -1151,12 +1150,22 @@ static void close_request(http_session_t * session) ...@@ -1151,12 +1150,22 @@ static void close_request(http_session_t * session)
memset(&session->req,0,sizeof(session->req)); memset(&session->req,0,sizeof(session->req));
} }
// Opens the response (SSJS output) file if necessary // Opens the response content (SSJS output) file if necessary
static bool response_file_open(http_session_t* session) static bool content_file_open(http_session_t* session)
{ {
const char* path = session->req.cleanup_file[CLEANUP_SSJS_TMP_FILE]; const char* path = session->req.cleanup_file[CLEANUP_SSJS_TMP_FILE];
if (session->req.fp == NULL && path != NULL) if (session->req.fp == NULL) {
session->req.fp = fopen(path, "wb"); if (path == NULL)
lprintf(LOG_CRIT, "%04d %s [%s] Response file path is NULL"
,session->socket, session->client.protocol, session->host_ip);
else {
session->req.fp = fopen(path, "wb");
if (session->req.fp == NULL) {
lprintf(LOG_ERR, "%04d %s [%s] Error %d (%s) opening/creating %s"
,session->socket, session->client.protocol, session->host_ip, errno, strerror(errno), path);
}
}
}
return session->req.fp != NULL; return session->req.fp != NULL;
} }
...@@ -2101,7 +2110,7 @@ static named_string_t** read_ini_list(char* path, char* section, char* desc ...@@ -2101,7 +2110,7 @@ static named_string_t** read_ini_list(char* path, char* section, char* desc
lprintf(LOG_DEBUG,"Read %lu %s from %s section of %s" lprintf(LOG_DEBUG,"Read %lu %s from %s section of %s"
,(ulong)i,desc,section==NULL ? "root":section,path); ,(ulong)i,desc,section==NULL ? "root":section,path);
} else } else
lprintf(warn ? LOG_WARNING : LOG_DEBUG, "Error %d opening %s", errno, path); lprintf(warn ? LOG_WARNING : LOG_DEBUG, "Error %d (%s) opening %s", errno, strerror(errno), path);
return(list); return(list);
} }
...@@ -5306,7 +5315,7 @@ js_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report) ...@@ -5306,7 +5315,7 @@ js_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
if(report==NULL) { if(report==NULL) {
lprintf(LOG_ERR,"%04d !JavaScript: %s", session->socket, message); lprintf(LOG_ERR,"%04d !JavaScript: %s", session->socket, message);
if(response_file_open(session)) if(content_file_open(session))
fprintf(session->req.fp,"!JavaScript: %s", message); fprintf(session->req.fp,"!JavaScript: %s", message);
return; return;
} }
...@@ -5334,7 +5343,7 @@ js_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report) ...@@ -5334,7 +5343,7 @@ js_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
lprintf(log_level,"%04d !JavaScript %s%s%s: %s, Request: %s" lprintf(log_level,"%04d !JavaScript %s%s%s: %s, Request: %s"
,session->socket,warning,file,line,message, session->req.request_line); ,session->socket,warning,file,line,message, session->req.request_line);
if(response_file_open(session)) if(content_file_open(session))
fprintf(session->req.fp,"!JavaScript %s%s%s: %s",warning,file,line,message); fprintf(session->req.fp,"!JavaScript %s%s%s: %s",warning,file,line,message);
} }
...@@ -5344,7 +5353,7 @@ static void js_writebuf(http_session_t *session, const char *buf, size_t buflen) ...@@ -5344,7 +5353,7 @@ static void js_writebuf(http_session_t *session, const char *buf, size_t buflen)
if(session->req.send_content) if(session->req.send_content)
writebuf(session,buf,buflen); writebuf(session,buf,buflen);
} }
else if(response_file_open(session)) else if(content_file_open(session))
fwrite(buf,1,buflen,session->req.fp); fwrite(buf,1,buflen,session->req.fp);
} }
...@@ -5363,7 +5372,7 @@ js_writefunc(JSContext *cx, uintN argc, jsval *arglist, BOOL writeln) ...@@ -5363,7 +5372,7 @@ js_writefunc(JSContext *cx, uintN argc, jsval *arglist, BOOL writeln)
if((session=(http_session_t*)JS_GetContextPrivate(cx))==NULL) if((session=(http_session_t*)JS_GetContextPrivate(cx))==NULL)
return(JS_FALSE); return(JS_FALSE);
if(!response_file_open(session)) { if(!content_file_open(session)) {
return(JS_FALSE); return(JS_FALSE);
} }
...@@ -6123,11 +6132,7 @@ static BOOL exec_ssjs(http_session_t* session, char* script) { ...@@ -6123,11 +6132,7 @@ static BOOL exec_ssjs(http_session_t* session, char* script) {
} while(0); } while(0);
SAFECOPY(session->req.physical_path, path); SAFECOPY(session->req.physical_path, path);
if(session->req.fp!=NULL) { FCLOSE_OPEN_FILE(session->req.fp);
fclose(session->req.fp);
session->req.fp=NULL;
}
/* Read http_reply object */ /* Read http_reply object */
if(!session->req.sent_headers) if(!session->req.sent_headers)
...@@ -6234,7 +6239,7 @@ FILE *open_post_file(http_session_t *session) ...@@ -6234,7 +6239,7 @@ FILE *open_post_file(http_session_t *session)
// Create temporary file for post data. // Create temporary file for post data.
SAFEPRINTF3(path,"%sSBBS_POST.%u.%u.data",scfg.temp_dir,getpid(),session->socket); SAFEPRINTF3(path,"%sSBBS_POST.%u.%u.data",scfg.temp_dir,getpid(),session->socket);
if((fp=fopen(path,"wb"))==NULL) { if((fp=fopen(path,"wb"))==NULL) {
lprintf(LOG_ERR,"%04d !ERROR %d opening/creating %s", session->socket, errno, path); lprintf(LOG_ERR,"%04d !ERROR %d (%s) opening/creating %s", session->socket, errno, strerror(errno), path);
return fp; return fp;
} }
if(session->req.cleanup_file[CLEANUP_POST_DATA]) { if(session->req.cleanup_file[CLEANUP_POST_DATA]) {
...@@ -6245,9 +6250,9 @@ FILE *open_post_file(http_session_t *session) ...@@ -6245,9 +6250,9 @@ FILE *open_post_file(http_session_t *session)
session->req.cleanup_file[CLEANUP_POST_DATA]=strdup(path); session->req.cleanup_file[CLEANUP_POST_DATA]=strdup(path);
if(session->req.post_data != NULL) { if(session->req.post_data != NULL) {
if(fwrite(session->req.post_data, session->req.post_len, 1, fp)!=1) { if(fwrite(session->req.post_data, session->req.post_len, 1, fp)!=1) {
lprintf(LOG_ERR,"%04d !ERROR writeing to %s", session->socket, path); lprintf(LOG_ERR,"%04d !ERROR %d (%s) writing to %s", session->socket, errno, strerror(errno), path);
fclose(fp); fclose(fp);
return(FALSE); return NULL;
} }
FREE_AND_NULL(session->req.post_data); FREE_AND_NULL(session->req.post_data);
} }
...@@ -6275,7 +6280,7 @@ int read_post_data(http_session_t * session) ...@@ -6275,7 +6280,7 @@ int read_post_data(http_session_t * session)
} }
else { else {
send_error(session,__LINE__,error_500); send_error(session,__LINE__,error_500);
if(fp) fclose(fp); FCLOSE_OPEN_FILE(fp);
return(FALSE); return(FALSE);
} }
if(ch_len==0) if(ch_len==0)
...@@ -6285,7 +6290,7 @@ int read_post_data(http_session_t * session) ...@@ -6285,7 +6290,7 @@ int read_post_data(http_session_t * session)
if(s > MAX_POST_LEN) { if(s > MAX_POST_LEN) {
if(s > SIZE_MAX) { if(s > SIZE_MAX) {
send_error(session,__LINE__,"413 Request entity too large"); send_error(session,__LINE__,"413 Request entity too large");
if(fp) fclose(fp); FCLOSE_OPEN_FILE(fp);
return(FALSE); return(FALSE);
} }
if(fp==NULL) { if(fp==NULL) {
...@@ -6305,7 +6310,7 @@ int read_post_data(http_session_t * session) ...@@ -6305,7 +6310,7 @@ int read_post_data(http_session_t * session)
if(p==NULL) { if(p==NULL) {
lprintf(LOG_CRIT,"%04d !ERROR Allocating %lu bytes of memory",session->socket, (ulong)session->req.post_len); lprintf(LOG_CRIT,"%04d !ERROR Allocating %lu bytes of memory",session->socket, (ulong)session->req.post_len);
send_error(session,__LINE__,"413 Request entity too large"); send_error(session,__LINE__,"413 Request entity too large");
if(fp) fclose(fp); FCLOSE_OPEN_FILE(fp);
return(FALSE); return(FALSE);
} }
session->req.post_data=p; session->req.post_data=p;
...@@ -6313,7 +6318,7 @@ int read_post_data(http_session_t * session) ...@@ -6313,7 +6318,7 @@ int read_post_data(http_session_t * session)
bytes_read=recvbufsocket(session,session->req.post_data+session->req.post_len,ch_len); bytes_read=recvbufsocket(session,session->req.post_data+session->req.post_len,ch_len);
if(!bytes_read) { if(!bytes_read) {
send_error(session,__LINE__,error_500); send_error(session,__LINE__,error_500);
if(fp) fclose(fp); FCLOSE_OPEN_FILE(fp);
return(FALSE); return(FALSE);
} }
session->req.post_len+=bytes_read; session->req.post_len+=bytes_read;
...@@ -6929,7 +6934,7 @@ void http_logging_thread(void* arg) ...@@ -6929,7 +6934,7 @@ void http_logging_thread(void* arg)
thread_up(TRUE /* setuid */); thread_up(TRUE /* setuid */);
lprintf(LOG_INFO,"HTTP logging thread started"); lprintf(LOG_INFO,"Web Server access logging thread started");
while(!terminate_http_logging_thread) { while(!terminate_http_logging_thread) {
struct log_data *ld; struct log_data *ld;
...@@ -6950,7 +6955,7 @@ void http_logging_thread(void* arg) ...@@ -6950,7 +6955,7 @@ void http_logging_thread(void* arg)
if(ld==NULL) { if(ld==NULL) {
if(terminate_http_logging_thread) if(terminate_http_logging_thread)
break; break;
lprintf(LOG_ERR,"HTTP logging thread received NULL linked list log entry"); lprintf(LOG_ERR,"Web Server access-logging thread received NULL linked list log entry");
continue; continue;
} }
SAFECOPY(newfilename,base); SAFECOPY(newfilename,base);
...@@ -6961,39 +6966,35 @@ void http_logging_thread(void* arg) ...@@ -6961,39 +6966,35 @@ void http_logging_thread(void* arg)
} }
strftime(strchr(newfilename,0),15,"%Y-%m-%d.log",&ld->completed); strftime(strchr(newfilename,0),15,"%Y-%m-%d.log",&ld->completed);
if(logfile==NULL || strcmp(newfilename,filename)) { if(logfile==NULL || strcmp(newfilename,filename)) {
if(logfile!=NULL) FCLOSE_OPEN_FILE(logfile);
fclose(logfile);
SAFECOPY(filename,newfilename); SAFECOPY(filename,newfilename);
logfile=fopen(filename,"ab"); logfile=fopen(filename,"ab");
if(logfile) if(logfile == NULL)
lprintf(LOG_INFO,"HTTP logfile is now: %s",filename); lprintf(LOG_ERR,"Web Server error %d (%s) opening/creating access-log file %s", errno, strerror(errno), filename);
else
lprintf(LOG_INFO,"Web Server access-log file is now: %s",filename);
} }
if(logfile!=NULL) { if(logfile!=NULL && ld->status) {
if(ld->status) { sprintf(sizestr,"%"PRIdOFF,ld->size);
sprintf(sizestr,"%"PRIdOFF,ld->size); strftime(timestr,sizeof(timestr),"%d/%b/%Y:%H:%M:%S %z",&ld->completed);
strftime(timestr,sizeof(timestr),"%d/%b/%Y:%H:%M:%S %z",&ld->completed); /*
/* * In case of a termination, do no block for a lock... just discard
* In case of a termination, do no block for a lock... just discard * the output.
* the output. */
*/ while(lock(fileno(logfile),0,1) && !terminate_http_logging_thread) {
while(lock(fileno(logfile),0,1) && !terminate_http_logging_thread) { SLEEP(10);
SLEEP(10);
}
fprintf(logfile,"%s %s %s [%s] \"%s\" %d %s \"%s\" \"%s\"\n"
,ld->hostname?(ld->hostname[0]?ld->hostname:"-"):"-"
,ld->ident?(ld->ident[0]?ld->ident:"-"):"-"
,ld->user?(ld->user[0]?ld->user:"-"):"-"
,timestr
,ld->request?(ld->request[0]?ld->request:"-"):"-"
,ld->status
,ld->size?sizestr:"-"
,ld->referrer?(ld->referrer[0]?ld->referrer:"-"):"-"
,ld->agent?(ld->agent[0]?ld->agent:"-"):"-");
unlock(fileno(logfile),0,1);
} }
} fprintf(logfile,"%s %s %s [%s] \"%s\" %d %s \"%s\" \"%s\"\n"
else { ,ld->hostname?(ld->hostname[0]?ld->hostname:"-"):"-"
lprintf(LOG_ERR,"HTTP server failed to open logfile %s (%d)!",filename,errno); ,ld->ident?(ld->ident[0]?ld->ident:"-"):"-"
,ld->user?(ld->user[0]?ld->user:"-"):"-"
,timestr
,ld->request?(ld->request[0]?ld->request:"-"):"-"
,ld->status
,ld->size?sizestr:"-"
,ld->referrer?(ld->referrer[0]?ld->referrer:"-"):"-"
,ld->agent?(ld->agent[0]?ld->agent:"-"):"-");
unlock(fileno(logfile),0,1);
} }
FREE_AND_NULL(ld->hostname); FREE_AND_NULL(ld->hostname);
FREE_AND_NULL(ld->ident); FREE_AND_NULL(ld->ident);
...@@ -7004,12 +7005,9 @@ void http_logging_thread(void* arg) ...@@ -7004,12 +7005,9 @@ void http_logging_thread(void* arg)
FREE_AND_NULL(ld->vhost); FREE_AND_NULL(ld->vhost);
FREE_AND_NULL(ld); FREE_AND_NULL(ld);
} }
if(logfile!=NULL) { FCLOSE_OPEN_FILE(logfile);
fclose(logfile);
logfile=NULL;
}
thread_down(); thread_down();
lprintf(LOG_INFO,"HTTP logging thread terminated"); lprintf(LOG_INFO,"Web Server access-logging thread terminated");
http_logging_thread_running=FALSE; http_logging_thread_running=FALSE;
} }
...@@ -7136,7 +7134,7 @@ void web_server(void* arg) ...@@ -7136,7 +7134,7 @@ void web_server(void* arg)
,ctime_r(&t,logstr),startup->options); ,ctime_r(&t,logstr),startup->options);
if(chdir(startup->ctrl_dir)!=0) if(chdir(startup->ctrl_dir)!=0)
lprintf(LOG_ERR,"!ERROR %d changing directory to: %s", errno, startup->ctrl_dir); lprintf(LOG_ERR,"!ERROR %d (%s) changing directory to: %s", errno, strerror(errno), startup->ctrl_dir);
/* Initial configuration and load from CNF files */ /* Initial configuration and load from CNF files */
SAFECOPY(scfg.ctrl_dir,startup->ctrl_dir); SAFECOPY(scfg.ctrl_dir,startup->ctrl_dir);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment