1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
Initial patch from http://trac.lighttpd.net/trac/ticket/296
Updated to apply against 1.4.20 by hoffie
Upstream will only accept it once it has been changed to make the pipe logging more generic
diff -r 447bac6969ef src/base.h
--- a/src/base.h Tue Aug 19 18:04:17 2008 +0200
+++ b/src/base.h Tue Aug 19 19:45:00 2008 +0200
@@ -530,7 +530,7 @@
/* the errorlog */
int errorlog_fd;
- enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
+ enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
buffer *errorlog_buf;
fdevents *ev, *ev_ins;
diff -r 447bac6969ef src/log.c
--- a/src/log.c Tue Aug 19 18:04:17 2008 +0200
+++ b/src/log.c Tue Aug 19 19:45:00 2008 +0200
@@ -57,10 +57,11 @@
/**
* open the errorlog
*
- * we have 3 possibilities:
+ * we have 4 possibilities:
* - stderr (default)
* - syslog
* - logfile
+ * - pipe
*
* if the open failed, report to the user and die
*
@@ -79,21 +80,80 @@
srv->errorlog_mode = ERRORLOG_SYSLOG;
} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
const char *logfile = srv->srvconf.errorlog_file->ptr;
+ if (logfile[0] == '|') {
+#ifdef HAVE_FORK
+ /* create write pipe and spawn process */
- if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
- log_error_write(srv, __FILE__, __LINE__, "SSSS",
+ int to_log_fds[2];
+ int fd;
+ pid_t pid;
+
+ if (pipe(to_log_fds)) {
+ log_error_write(srv, __FILE__, __LINE__, "ss",
+ "pipe failed: ", strerror(errno));
+ return -1;
+ }
+
+ /* fork, execve */
+ switch (pid = fork()) {
+ case 0:
+ /* child */
+
+ close(STDIN_FILENO);
+ dup2(to_log_fds[0], STDIN_FILENO);
+ close(to_log_fds[0]);
+ /* not needed */
+ close(to_log_fds[1]);
+
+ /* we don't need the client socket */
+ for (fd = 3; fd < 256; fd++) {
+ close(fd);
+ }
+
+ /* exec the log-process (skip the | )
+ *
+ */
+
+ execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
+
+ log_error_write(srv, __FILE__, __LINE__, "sss",
+ "spawning log-process failed: ",
+ strerror(errno), logfile + 1);
+
+ exit(-1);
+ break;
+ case -1:
+ /* error */
+ log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
+ break;
+ default:
+ close(to_log_fds[0]);
+
+ srv->errorlog_fd = to_log_fds[1];
+
+ break;
+ }
+ srv->errorlog_mode = ERRORLOG_PIPE;
+#else
+ log_error_write(srv, __FILE__, __LINE__, "SSS",
+ "opening errorlog '", logfile,"' impossible");
+ return -1;
+#endif
+ } else {
+ if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
+ log_error_write(srv, __FILE__, __LINE__, "SSSS",
"opening errorlog '", logfile,
"' failed: ", strerror(errno));
- return -1;
+ return -1;
+ }
+ srv->errorlog_mode = ERRORLOG_FILE;
}
#ifdef FD_CLOEXEC
/* close fd on exec (cgi) */
fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
#endif
- srv->errorlog_mode = ERRORLOG_FILE;
}
-
log_error_write(srv, __FILE__, __LINE__, "s", "server started");
#ifdef HAVE_VALGRIND_VALGRIND_H
@@ -122,7 +182,7 @@
*/
int log_error_cycle(server *srv) {
- /* only cycle if we are not in syslog-mode */
+ /* only cycle if the error log is a file */
if (srv->errorlog_mode == ERRORLOG_FILE) {
const char *logfile = srv->srvconf.errorlog_file->ptr;
@@ -154,6 +214,7 @@
int log_error_close(server *srv) {
switch(srv->errorlog_mode) {
+ case ERRORLOG_PIPE: /* fall through */
case ERRORLOG_FILE:
close(srv->errorlog_fd);
break;
@@ -173,6 +234,7 @@
va_list ap;
switch(srv->errorlog_mode) {
+ case ERRORLOG_PIPE:
case ERRORLOG_FILE:
case ERRORLOG_STDERR:
/* cache the generated timestamp */
@@ -257,6 +319,7 @@
va_end(ap);
switch(srv->errorlog_mode) {
+ case ERRORLOG_PIPE: /* fall through */
case ERRORLOG_FILE:
buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN("\n"));
write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
diff -r 447bac6969ef src/mod_cgi.c
--- a/src/mod_cgi.c Tue Aug 19 18:04:17 2008 +0200
+++ b/src/mod_cgi.c Tue Aug 19 19:45:00 2008 +0200
@@ -781,7 +781,7 @@
*
* we feed the stderr of the CGI to our errorlog, if possible
*/
- if (srv->errorlog_mode == ERRORLOG_FILE) {
+ if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
close(STDERR_FILENO);
dup2(srv->errorlog_fd, STDERR_FILENO);
}
diff -r 447bac6969ef src/mod_rrdtool.c
--- a/src/mod_rrdtool.c Tue Aug 19 18:04:17 2008 +0200
+++ b/src/mod_rrdtool.c Tue Aug 19 19:45:00 2008 +0200
@@ -134,7 +134,7 @@
close(STDERR_FILENO);
- if (srv->errorlog_mode == ERRORLOG_FILE) {
+ if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
dup2(srv->errorlog_fd, STDERR_FILENO);
close(srv->errorlog_fd);
}
|
GitWeb