Add support for zlog_limit to zlog stream

Author: bukka

sapi/fpm/fpm/zlog.c

@@ -326,10 +326,10 @@ static zlog_bool zlog_stream_buf_alloc_ex(struct zlog_stream *stream, size_t nee
 	size_t size;
 
 	if (stream->buf) {
-		size = MAX(stream->buf_size * 2, needed);
+		size = MIN(zlog_limit, MAX(stream->buf_size * 2, needed));
 		buf = realloc(stream->buf, size);
 	} else {
-		size = MAX(stream->buf_size, needed);
+		size = MIN(zlog_limit, MAX(stream->buf_size, needed));
 		buf = malloc(size);
 	}
 
@@ -352,24 +352,61 @@ inline static zlog_bool zlog_stream_buf_alloc(struct zlog_stream *stream)  /* {{
 
 static ssize_t zlog_stream_buf_append(struct zlog_stream *stream, const char *str, size_t len)  /* {{{ */
 {
-	if (stream->buf_size - stream->buf_len <= len && !zlog_stream_buf_alloc_ex(stream, len)) {
+	int finished = 0;
+
+	if (stream->finished) {
+		return 0;
+	}
+
+	if (stream->len + len > zlog_limit) {
+		stream->finished = finished = 1;
+		len = zlog_limit - stream->len;
+	}
+
+	if (stream->buf_size - stream->len <= len && !zlog_stream_buf_alloc_ex(stream, len)) {
 		return -1;
 	}
 
 	memcpy(stream->buf, str, len);
-	stream->buf_len += len;
+	stream->len += len;
+
+	if (finished) {
+		stream->len = zlog_truncate_buf(stream->buf, stream->len);
+	}
 
 	return len;
 }
 
-static inline size_t zlog_stream_write(struct zlog_stream *stream, const char *buf, size_t len) /* {{{ */
+static inline ssize_t zlog_stream_write(struct zlog_stream *stream, const char *buf, size_t len) /* {{{ */
 {
+	int finished = 0;
+	const char *append;
+	size_t append_len;
+
+	if (stream->finished) {
+		return 0;
+	}
+
+	if (stream->len + len >= zlog_limit) {
+		stream->finished = finished = 1;
+		append = (stream->len + len == zlog_limit) ? "\n" : "...\n";
+		append_len = sizeof(append) - 1;
+		len = zlog_limit - stream->len - append_len;
+	}
+
 	if (stream->use_fd) {
-		zend_quiet_write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len);
+		int write_fd = zlog_fd > -1 ? zlog_fd : STDERR_FILENO;
+		zend_quiet_write(write_fd, buf, len);
+		if (finished) {
+			zend_quiet_write(write_fd, append, append_len);
+		}
 	}
 
 	if (stream->use_stderr) {
 		zend_quiet_write(STDERR_FILENO, buf, len);
+		if (finished) {
+			zend_quiet_write(STDERR_FILENO, append, append_len);
+		}
 	}
 
 	return len;
@@ -409,7 +446,7 @@ ssize_t zlog_stream_prefix_ex(struct zlog_stream *stream, const char *function,
 			return -1;
 		}
 		len = zlog_buf_prefix(function, line, stream->flags, stream->buf, stream->buf_size);
-		stream->buf_len = stream->prefix_len = len;
+		stream->len = stream->prefix_len = len;
 		return len;
 	} else {
 		char sbuf[1024];
@@ -466,12 +503,12 @@ zlog_bool zlog_stream_finish(struct zlog_stream *stream) /* {{{ */
 	if (stream->use_buffer) {
 #ifdef HAVE_SYSLOG_H
 		if (zlog_fd == ZLOG_SYSLOG) {
-			stream->buf[stream->buf_len] = '\0';
+			stream->buf[stream->len] = '\0';
 			php_syslog(syslog_priorities[zlog_level], "%s", stream->buf);
 		}
 #endif
-		stream->buf[stream->buf_len++] = '\n';
-		zlog_stream_write(stream, stream->buf, stream->buf_len);
+		stream->buf[stream->len++] = '\n';
+		zlog_stream_write(stream, stream->buf, stream->len);
 	} else {
 		zlog_stream_write(stream, "\n", 1);
 	}

sapi/fpm/fpm/zlog.h

@@ -69,7 +69,8 @@ struct zlog_stream {
 	unsigned int use_buffer:1;
 	unsigned int use_stderr:1;
 	unsigned int prefix_buffer:1;
-	size_t buf_len;
+	unsigned int finished:1;
+	size_t len;
 	size_t buf_size;
 	char *buf;
 	size_t prefix_len;