Author: mturk
Date: Tue Jan 18 08:56:45 2011
New Revision: 1060243
URL: http://svn.apache.org/viewvc?rev=1060243&view=rev
Log:
DAEMON-186, DAEMON-194 Fix jsvc syslog for invalid descriptors and break from
the infinite loop when child exits
Modified:
commons/proper/daemon/trunk/RELEASE-NOTES.txt
commons/proper/daemon/trunk/src/native/unix/CHANGES.txt
commons/proper/daemon/trunk/src/native/unix/native/jsvc-unix.c
Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/RELEASE-NOTES.txt?rev=1060243&r1=1060242&r2=1060243&view=diff
==============================================================================
--- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Tue Jan 18 08:56:45 2011
@@ -70,7 +70,7 @@ NEW FEATURES:
BUG FIXES:
-1.0.6:
+1.0.6: DAEMON-186, DAEMON-194
1.0.5: DAEMON-158, DAEMON-187, DAEMON-188, DAEMON-190
Modified: commons/proper/daemon/trunk/src/native/unix/CHANGES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/CHANGES.txt?rev=1060243&r1=1060242&r2=1060243&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/CHANGES.txt (original)
+++ commons/proper/daemon/trunk/src/native/unix/CHANGES.txt Tue Jan 18 08:56:45
2011
@@ -2,7 +2,8 @@ APACHE COMMONS DAEMON (UNIX) CHANGELOG:
Last modified at [$Date$]
Changes with 1.0.6
-
+ * Fix syslog infinite loop (DAEMON-194)
+ * Fix syslog invalid descriptors (DAEMON-186)
Changes with 1.0.5
Modified: commons/proper/daemon/trunk/src/native/unix/native/jsvc-unix.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/jsvc-unix.c?rev=1060243&r1=1060242&r2=1060243&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/jsvc-unix.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/jsvc-unix.c Tue Jan 18
08:56:45 2011
@@ -777,47 +777,77 @@ static int logger_child(int out_fd, int
{
fd_set rfds;
struct timeval tv;
- int retval, n;
+ int retval, nfd = -1, rc = 0;
+ ssize_t n;
char buf[LOGBUF_SIZE];
- if (out_fd > err_fd) {
- n = out_fd + 1;
- } else {
- n = err_fd + 1;
- }
+ if (out_fd == -1 && err_fd == -1)
+ return EINVAL;
+ if (out_fd == -1)
+ nfd = err_fd;
+ else if (err_fd == -1)
+ nfd = out_fd;
+ else
+ nfd = out_fd > err_fd ? out_fd : err_fd;
+ ++nfd;
openlog(procname, LOG_PID, LOG_DAEMON);
- while (1) {
+ while (out_fd != -1 || err_fd != -1) {
FD_ZERO(&rfds);
- FD_SET(out_fd, &rfds);
- FD_SET(err_fd, &rfds);
- tv.tv_sec = 60;
+ if (out_fd != -1) {
+ FD_SET(out_fd, &rfds);
+ }
+ if (err_fd != -1) {
+ FD_SET(err_fd, &rfds);
+ }
+ tv.tv_sec = 60;
tv.tv_usec = 0;
- retval = select(n, &rfds, NULL, NULL, &tv);
- if (retval == -1)
+ retval = select(nfd, &rfds, NULL, NULL, &tv);
+ if (retval == -1) {
+ rc = errno;
syslog(LOG_ERR, "select: %s", strerror(errno));
+ /* If select failed no point to continue */
+ break;
+ }
else if (retval) {
- if (FD_ISSET(out_fd, &rfds)) {
- ssize_t n = read(out_fd, buf, LOGBUF_SIZE-1);
- if (n < 0) {
+ if (out_fd != -1 && FD_ISSET(out_fd, &rfds)) {
+ do {
+ n = read(out_fd, buf, LOGBUF_SIZE-1);
+ } while (n == -1 && errno == EINTR);
+ if (n == -1) {
syslog(LOG_ERR, "read: %s", strerror(errno));
- } else if (n > 0 && buf[0] != '\n') {
+ close(out_fd);
+ if (err_fd == -1)
+ break;
+ nfd = err_fd + 1;
+ out_fd = -1;
+ }
+ else if (n > 0 && buf[0] != '\n') {
buf[n] = 0;
syslog(LOG_INFO, "%s", buf);
}
}
- if (FD_ISSET(err_fd, &rfds)) {
- ssize_t n = read(err_fd, buf, LOGBUF_SIZE-1);
- if (n < 0) {
+ if (err_fd != -1 && FD_ISSET(err_fd, &rfds)) {
+ do {
+ n = read(err_fd, buf, LOGBUF_SIZE-1);
+ } while (n == -1 && errno == EINTR);
+ if (n == -1) {
syslog(LOG_ERR, "read: %s", strerror(errno));
- } else if (n > 0 && buf[0] != '\n') {
+ close(err_fd);
+ if (out_fd == -1)
+ break;
+ nfd = out_fd + 1;
+ err_fd = -1;
+ }
+ else if (n > 0 && buf[0] != '\n') {
buf[n] = 0;
syslog(LOG_ERR, "%s", buf);
}
}
}
}
+ return rc;
}
/**
@@ -825,7 +855,9 @@ static int logger_child(int out_fd, int
*/
static void set_output(char *outfile, char *errfile, bool redirectstdin, char
*procname)
{
- int out_pipe[2] = {0, 0}, err_pipe[2] = {0, 0}, fork_needed = 0;
+ int out_pipe[2] = {-1, -1};
+ int err_pipe[2] = {-1, -1};
+ int fork_needed = 0;
if (redirectstdin == true) {
freopen("/dev/null", "r", stdin);
@@ -896,24 +928,27 @@ static void set_output(char *outfile, ch
pid_t pid = fork();
if (pid == -1) {
log_error("cannot create logger process: %s", strerror(errno));
- } else {
- if (pid) {
+ }
+ else {
+ if (pid == 0) {
+ /* Child process */
logger_pid = pid;
- if (out_pipe[0] != 0) {
+ if (out_pipe[0] != -1) {
close(out_pipe[0]);
if (dup2(out_pipe[1], 1) == -1) {
log_error("cannot redirect stdout to pipe for syslog:
%s",
strerror(errno));
}
}
- if (err_pipe[0] != 0) {
+ if (err_pipe[0] != -1) {
close(err_pipe[0]);
if (dup2(err_pipe[1], 2) == -1) {
log_error("cannot redirect stderr to pipe for syslog:
%s",
strerror(errno));
}
}
- } else {
+ }
+ else {
exit(logger_child(out_pipe[0], err_pipe[0], procname));
}
}
