Remember function and line when using wrap

Author: bukka

sapi/fpm/fpm/zlog.c

@@ -365,8 +365,7 @@ static ssize_t zlog_stream_buf_append(struct zlog_stream *stream, const char *st
 		/* TODO: append wrap_suffix before the write */
 		zlog_stream_direct_write(stream, stream->buf, stream->len);
 		stream->len = 0;
-		/* TODO: use function and line from the initial call (remember them and call zlog_stream_prefix_ex) */
-		zlog_stream_prefix(stream);
+		zlog_stream_prefix_ex(stream, stream->function, stream->line);
 		return available_len + zlog_stream_buf_append(stream, str + available_len, str_len - available_len);
 	}
 
@@ -482,6 +481,10 @@ ssize_t zlog_stream_prefix_ex(struct zlog_stream *stream, const char *function,
 	if (!stream->prefix_buffer) {
 		return 1;
 	}
+	if (stream->wrap && stream->function == NULL) {
+		stream->function = function;
+		stream->line = line;
+	}
 
 	if (stream->use_buffer) {
 		if (!zlog_stream_buf_alloc(stream)) {

sapi/fpm/fpm/zlog.h

@@ -64,6 +64,8 @@ struct zlog_stream {
 	unsigned int finished:1;
 	unsigned int wrap:1;
 	int fd;
+	int line;
+	const char *function;
 	size_t len;
 	size_t buf_size;
 	char *buf;
@@ -74,6 +76,7 @@ struct zlog_stream {
 	size_t wrap_suffix_len;
 	char *wrap_final_suffix;
 	size_t wrap_final_suffix_len;
+
 };
 
 void zlog_stream_init(struct zlog_stream *stream, int flags);