Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Added signal handler to file_upload_handler along with a bit 

of logging.  This is intended to help debug file uploading
problems, where apache kills the file upload handler because
something is going wrong.

svn path=/trunk/boinc/; revision=5824
This commit is contained in:
Bruce Allen 2005-04-11 09:00:50 +00:00
parent 06a2ff4e4e
commit 48a37d0cd2
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -27008,3 +27008,13 @@ David 10 April 2005
Makefile.am
lib/
filesys.C
Bruce 11 April 2--5
- Added signal handler to file_upload_handler along with a bit
of logging. This is intended to help debug file uploading
problems, where apache kills the file upload handler because
something is going wrong.
sched/
file_upload_handler.C

34
sched/file_upload_handler.C
View File

@ -49,6 +49,8 @@ SCHED_CONFIG config;
#define DEBUG_LEVEL SCHED_MSG_LOG::NORMAL
char this_filename[256];
struct FILE_INFO {
char name[256];
double max_nbytes;
@ -72,7 +74,10 @@ int FILE_INFO::parse(FILE* in) {
continue;
}
strcatdup(signed_xml, buf);
if (parse_str(buf, "<name>", name, sizeof(name))) continue;
if (parse_str(buf, "<name>", name, sizeof(name))) {
strcpy(this_filename, name);
continue;
}
if (parse_double(buf, "<max_nbytes>", max_nbytes)) continue;
if (match_tag(buf, "<generated_locally/>")) continue;
if (match_tag(buf, "<upload_when_present/>")) continue;
@ -128,6 +133,7 @@ int return_success(const char* text) {
}
#define BLOCK_SIZE 16382
double bytes_left;
// read from socket, write to file
// ALWAYS returns an HTML reply
@ -137,7 +143,6 @@ int copy_socket_to_file(FILE* in, char* path, double offset, double nbytes) {
char buf2[256];
FILE* out;
int retval, n, m;
double bytes_left;
out = fopen(path, "ab");
if (!out) {
@ -285,7 +290,8 @@ int handle_file_upload(FILE* in, R_RSA_PUBLIC_KEY& key) {
);
log_messages.printf(
SCHED_MSG_LOG::NORMAL,
"Starting upload of %s from %s [offset=%.0f, nbytes=%.0f]\n",
"PID=%d Starting upload of %s from %s [offset=%.0f, nbytes=%.0f]\n",
getpid(),
file_info.name,
get_remote_addr(),
offset, nbytes
@ -413,24 +419,32 @@ int get_key(R_RSA_PUBLIC_KEY& key) {
return 0;
}
void boinc_catch_signal(int ) {
int pid;
void boinc_catch_signal(int signal_num) {
log_messages.printf(SCHED_MSG_LOG::CRITICAL,
"FILE=%s (%.0f bytes left) IP=%s PID=%d caught signal %d [%s]\n",
this_filename, bytes_left, get_remote_addr(), pid, signal_num, sys_siglist[signal_num]
);
exit(1);
}
void installer() {
pid=getpid();
signal(SIGHUP, boinc_catch_signal); // terminal line hangup
signal(SIGINT, boinc_catch_signal); // interrupt program
signal(SIGQUIT, boinc_catch_signal); // quit program
signal(SIGQUIT, boinc_catch_signal); // quit program
signal(SIGILL, boinc_catch_signal); // illegal instruction
signal(SIGTRAP, boinc_catch_signal); // illegal instruction
signal(SIGTRAP, boinc_catch_signal); // illegal instruction
signal(SIGABRT, boinc_catch_signal); // abort(2) call
signal(SIGFPE, boinc_catch_signal); // bus error
signal(SIGKILL, boinc_catch_signal); // bus error
signal(SIGKILL, boinc_catch_signal); // bus error
signal(SIGBUS, boinc_catch_signal); // bus error
signal(SIGSEGV, boinc_catch_signal); // segmentation violation
signal(SIGSYS, boinc_catch_signal); // system call given invalid argument
signal(SIGPIPE, boinc_catch_signal); // write on a pipe with no reader
signal(SIGTERM, boinc_catch_signal); // write on a pipe with no reader
signal(SIGSTOP, boinc_catch_signal); // write on a pipe with no reader
signal(SIGTERM, boinc_catch_signal); // terminate process
}
int main() {
@ -438,6 +452,8 @@ int main() {
R_RSA_PUBLIC_KEY key;
char log_path[256];
installer();
get_log_path(log_path, "file_upload_handler.log");
if (!freopen(log_path, "a", stderr)) {
fprintf(stderr, "Can't open log file\n");