Add wrap_suffix and wrap_final_suffix to zlog stream buffer

Author: bukka

sapi/fpm/fpm/zlog.c

@@ -337,6 +337,18 @@ static inline ssize_t zlog_stream_unbuffered_write(struct zlog_stream *stream, c
 }
 /* }}} */
 
+static inline ssize_t zlog_stream_buf_copy(struct zlog_stream *stream, const char *str, size_t str_len)  /* {{{ */
+{
+	if (stream->buf_size - stream->len <= str_len && !zlog_stream_buf_alloc_ex(stream, str_len)) {
+		return -1;
+	}
+
+	memcpy(stream->buf + stream->len, str, str_len);
+	stream->len += str_len;
+
+	return str_len;
+}
+
 /* TODO: handle errors from this function in all calls (check for -1) */
 static ssize_t zlog_stream_buf_append(struct zlog_stream *stream, const char *str, size_t str_len)  /* {{{ */
 {
@@ -350,19 +362,18 @@ static ssize_t zlog_stream_buf_append(struct zlog_stream *stream, const char *st
 		available_len = str_len;
 	}
 
-	if (stream->buf_size - stream->len <= available_len && !zlog_stream_buf_alloc_ex(stream, available_len)) {
+	if (zlog_stream_buf_copy(stream, str, available_len) < 0) {
 		return -1;
 	}
 
-	memcpy(stream->buf + stream->len, str, available_len);
-	stream->len += available_len;
-
 	if (!finished) {
 		return available_len;
 	}
 
 	if (stream->wrap) {
-		/* TODO: append wrap_suffix before the write */
+		if (stream->wrap_suffix != NULL) {
+			zlog_stream_buf_copy(stream, stream->wrap_suffix, stream->wrap_suffix_len);
+		}
 		zlog_stream_direct_write(stream, stream->buf, stream->len);
 		stream->len = 0;
 		zlog_stream_prefix_ex(stream, stream->function, stream->line);
@@ -550,7 +561,9 @@ ssize_t zlog_stream_str(struct zlog_stream *stream, const char *str, size_t str_
 zlog_bool zlog_stream_finish(struct zlog_stream *stream) /* {{{ */
 {
 	if (stream->use_buffer) {
-		/* TODO: append stream->wrap_final_suffix */
+		if (stream->wrap_final_suffix != NULL) {
+			zlog_stream_buf_copy(stream, stream->wrap_final_suffix, stream->wrap_final_suffix_len);
+		}
 		if (external_logger != NULL) {
 			external_logger(stream->flags & ZLOG_LEVEL_MASK,
 					stream->buf + stream->prefix_len, stream->len - stream->prefix_len);