Use and fix zlog_stream for error_log

Author: bukka

sapi/fpm/fpm/fpm_main.c

@@ -662,7 +662,14 @@ void sapi_cgi_log_fastcgi(int level, char *message, size_t len)
  */
 static void sapi_cgi_log_message(char *message, int syslog_type_int)
 {
-	zlog_msg(ZLOG_NOTICE, message, strlen(message), "PHP message: ");
+	struct zlog_stream stream;
+	size_t message_len = strlen(message);
+
+	zlog_stream_init_ex(&stream, ZLOG_NOTICE, message_len + sizeof("PHP message: "));
+	zlog_stream_prefix(&stream);
+	zlog_stream_str(&stream, "PHP message: ", sizeof("PHP message: ") - 1);
+	zlog_stream_str(&stream, message, message_len);
+	zlog_stream_finish(&stream);
 }
 /* }}} */
 

sapi/fpm/fpm/zlog.c

@@ -363,7 +363,7 @@ static ssize_t zlog_stream_buf_append(struct zlog_stream *stream, const char *st
 		return -1;
 	}
 
-	memcpy(stream->buf, str, len);
+	memcpy(stream->buf + stream->len, str, len);
 	stream->len += len;
 
 	if (finished) {

sapi/fpm/fpm/zlog.h

@@ -79,7 +79,7 @@ struct zlog_stream {
 void zlog_stream_init(struct zlog_stream *stream, int flags);
 void zlog_stream_init_ex(struct zlog_stream *stream, int flags, size_t capacity);
 #define zlog_stream_prefix(stream) \
-	zlog_stream_prefix(stream, __func__, __LINE__)
+	zlog_stream_prefix_ex(stream, __func__, __LINE__)
 ssize_t zlog_stream_prefix_ex(struct zlog_stream *stream, const char *function, int line);
 #define zlog_stream_start(stream, flags) \
 	zlog_stream_prefix(stream, flags, __func__, __LINE__)