From: Timo Sirainen <tss@iki.fi>
Date: Fri, 22 Nov 2013 20:05:52 +0000 (+0200)
Subject: iostream-rawlog: Timestamp prefix is now optional.
X-Git-Tag: 2.2.9~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b367011da1a2ba3e9113dfbc601aaa4b6b04317d;p=thirdparty%2Fdovecot%2Fcore.git

iostream-rawlog: Timestamp prefix is now optional.
---

diff --git a/src/lib/iostream-rawlog-private.h b/src/lib/iostream-rawlog-private.h
index d73bf5d6d4..12ec9581e7 100644
--- a/src/lib/iostream-rawlog-private.h
+++ b/src/lib/iostream-rawlog-private.h
@@ -5,7 +5,8 @@
 
 enum iostream_rawlog_flags {
 	IOSTREAM_RAWLOG_FLAG_AUTOCLOSE	= 0x01,
-	IOSTREAM_RAWLOG_FLAG_BUFFERED	= 0x02
+	IOSTREAM_RAWLOG_FLAG_BUFFERED	= 0x02,
+	IOSTREAM_RAWLOG_FLAG_TIMESTAMP	= 0x04
 };
 
 struct rawlog_iostream {
diff --git a/src/lib/iostream-rawlog.c b/src/lib/iostream-rawlog.c
index ce17df454c..da2ab2dea4 100644
--- a/src/lib/iostream-rawlog.c
+++ b/src/lib/iostream-rawlog.c
@@ -41,6 +41,9 @@ rawlog_write_timestamp(struct rawlog_iostream *rstream, bool line_ends)
 	unsigned char data[MAX_INT_STRLEN + 6 + 1 + 3];
 	buffer_t buf;
 
+	if ((rstream->flags & IOSTREAM_RAWLOG_FLAG_TIMESTAMP) == 0)
+		return 0;
+
 	buffer_create_from_data(&buf, data, sizeof(data));
 	str_printfa(&buf, "%lu.%06u ",
 		    (unsigned long)ioloop_timeval.tv_sec,
@@ -187,10 +190,13 @@ int iostream_rawlog_create_prefix(const char *prefix, struct istream **input,
 
 	old_input = *input;
 	old_output = *output;
+
 	*input = i_stream_create_rawlog(old_input, in_path, in_fd,
-					IOSTREAM_RAWLOG_FLAG_AUTOCLOSE);
+					IOSTREAM_RAWLOG_FLAG_AUTOCLOSE |
+					IOSTREAM_RAWLOG_FLAG_TIMESTAMP);
 	*output = o_stream_create_rawlog(old_output, out_path, out_fd,
-					 IOSTREAM_RAWLOG_FLAG_AUTOCLOSE);
+					 IOSTREAM_RAWLOG_FLAG_AUTOCLOSE |
+					 IOSTREAM_RAWLOG_FLAG_TIMESTAMP);
 	i_stream_unref(&old_input);
 	o_stream_unref(&old_output);
 	return 0;
@@ -212,10 +218,12 @@ int iostream_rawlog_create_path(const char *path, struct istream **input,
 	old_input = *input;
 	old_output = *output;
 	*input = i_stream_create_rawlog(old_input, path, fd,
-					IOSTREAM_RAWLOG_FLAG_BUFFERED);
+					IOSTREAM_RAWLOG_FLAG_BUFFERED |
+					IOSTREAM_RAWLOG_FLAG_TIMESTAMP);
 	*output = o_stream_create_rawlog(old_output, path, fd,
 					 IOSTREAM_RAWLOG_FLAG_AUTOCLOSE |
-					 IOSTREAM_RAWLOG_FLAG_BUFFERED);
+					 IOSTREAM_RAWLOG_FLAG_BUFFERED |
+					 IOSTREAM_RAWLOG_FLAG_TIMESTAMP);
 	i_stream_unref(&old_input);
 	o_stream_unref(&old_output);
 	return 0;