Attachment #109134 for bug #165200

View | Details | Raw Unified | Return to bug 165200
Collapse All | Expand All

Lines 398-404 Link Here

(-)evms-2.5.5.orig/engine/dm-targets.c (-1 / +1 lines)
398	if (WIFSIGNALED(status)) {	398	if (WIFSIGNALED(status)) {
399	LOG_WARNING("\"%s %s\" was terminated by signal %s\n",	399	LOG_WARNING("\"%s %s\" was terminated by signal %s\n",
400	argv[0], argv[1],	400	argv[0], argv[1],
401	sys_siglist[WTERMSIG(status)]);	401	strsignal(WTERMSIG(status)));
402	rc = EINTR;	402	rc = EINTR;
403	} else {	403	} else {
404	rc = WEXITSTATUS(status);	404	rc = WEXITSTATUS(status);

Lines 618-624 Link Here

(-)evms-2.5.5.orig/engine/engine.c (-2 / +2 lines)
618		618
619	if (rc == 0) {	619	if (rc == 0) {
620	if (WIFSIGNALED(status)) {	620	if (WIFSIGNALED(status)) {
621	LOG_WARNING("\"%s %s\" was terminated by signal %s\n", argv[0], argv[1], sys_siglist[WTERMSIG(status)]);	621	LOG_WARNING("\"%s %s\" was terminated by signal %s\n", argv[0], argv[1], strsignal(WTERMSIG(status)));
622	rc = EINTR;	622	rc = EINTR;
623		623
624	} else {	624	} else {
Lines 1606-1612 Link Here
1606	static void sigusr1_handler(int sig_no) {	1606	static void sigusr1_handler(int sig_no) {
1607		1607
1608	LOG_CRITICAL("***\n");	1608	LOG_CRITICAL("***\n");
1609	LOG_CRITICAL("*** Received shutdown signal: %s.\n", sys_siglist[sig_no]);	1609	LOG_CRITICAL("*** Received shutdown signal: %s.\n", strsignal(sig_no));
1610	LOG_CRITICAL("***\n");	1610	LOG_CRITICAL("***\n");
1611		1611
1612	sem_post(&shutdown_sem);	1612	sem_post(&shutdown_sem);

Lines 65-71 Link Here

(-)evms-2.5.5.orig/engine/faulthdlr.c (-1 / +1 lines)
65	strcpy(sig_msg + timestamp_len,"***\n");	65	strcpy(sig_msg + timestamp_len,"***\n");
66	write(log_file_fd, sig_msg, strlen(sig_msg));	66	write(log_file_fd, sig_msg, strlen(sig_msg));
67		67
68	sprintf(sig_msg + timestamp_len, "*** Signal: %s\n", sys_siglist[sig_no]);	68	sprintf(sig_msg + timestamp_len, "*** Signal: %s\n", strsignal(sig_no));
69	write(log_file_fd, sig_msg, strlen(sig_msg));	69	write(log_file_fd, sig_msg, strlen(sig_msg));
70		70
71	strcpy(sig_msg + timestamp_len,"***\n");	71	strcpy(sig_msg + timestamp_len,"***\n");





				} else {
					if (WIFSIGNALED(status)) {
						LOG_SERIOUS("mount was terminated by signal %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
						rc = EINTR;

					} else {


				} else {
					if (WIFSIGNALED(status)) {
						LOG_SERIOUS("umount was terminated by signal %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
						rc = EINTR;

					} else {


					} else {
						if (WIFSIGNALED(status)) {
							LOG_SERIOUS("mount was terminated by signal %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
							rc = EINTR;

						} else {

Lines 153-159 Link Here

(-)evms-2.5.5.orig/plugins/md/md_main.c (-1 / +1 lines)
153		153
154	if (rc == 0) {	154	if (rc == 0) {
155	if (WIFSIGNALED(status)) {	155	if (WIFSIGNALED(status)) {
156	LOG_WARNING("\"%s %s\" was terminated by signal %s\n", argv[0], argv[1], sys_siglist[WTERMSIG(status)]);	156	LOG_WARNING("\"%s %s\" was terminated by signal %s\n", argv[0], argv[1], strsignal(WTERMSIG(status)));
157	rc = EINTR;	157	rc = EINTR;
158		158
159	} else {	159	} else {

Return to bug 165200

Lines 3087-3093 Link Here

(-)evms-2.5.5.orig/engine/volume.c (-3 / +3 lines)
3087		3087
3088	} else {	3088	} else {
3089	if (WIFSIGNALED(status)) {	3089	if (WIFSIGNALED(status)) {
3090	LOG_SERIOUS("mount was terminated by signal %d: %s\n", WTERMSIG(status), sys_siglist[WTERMSIG(status)]);	3090	LOG_SERIOUS("mount was terminated by signal %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
3091	rc = EINTR;	3091	rc = EINTR;
3092		3092
3093	} else {	3093	} else {
Lines 3259-3265 Link Here
3259		3259
3260	} else {	3260	} else {
3261	if (WIFSIGNALED(status)) {	3261	if (WIFSIGNALED(status)) {
3262	LOG_SERIOUS("umount was terminated by signal %d: %s\n", WTERMSIG(status), sys_siglist[WTERMSIG(status)]);	3262	LOG_SERIOUS("umount was terminated by signal %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
3263	rc = EINTR;	3263	rc = EINTR;
3264		3264
3265	} else {	3265	} else {
Lines 3461-3467 Link Here
3461		3461
3462	} else {	3462	} else {
3463	if (WIFSIGNALED(status)) {	3463	if (WIFSIGNALED(status)) {
3464	LOG_SERIOUS("mount was terminated by signal %d: %s\n", WTERMSIG(status), sys_siglist[WTERMSIG(status)]);	3464	LOG_SERIOUS("mount was terminated by signal %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
3465	rc = EINTR;	3465	rc = EINTR;
3466		3466
3467	} else {	3467	} else {