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

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/cf38c8eb8493
changeset: 17001:cf38c8eb8493
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Nov 22 22:05:52 2013 +0200
description:
iostream-rawlog: Timestamp prefix is now optional.

diffstat:

 src/lib/iostream-rawlog-private.h |   3 ++-
 src/lib/iostream-rawlog.c         |  16 ++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r 84ccfa053bcd -r cf38c8eb8493 src/lib/iostream-rawlog-private.h
--- a/src/lib/iostream-rawlog-private.h	Fri Nov 22 19:39:13 2013 +0200
+++ b/src/lib/iostream-rawlog-private.h	Fri Nov 22 22:05:52 2013 +0200
@@ -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 -r 84ccfa053bcd -r cf38c8eb8493 src/lib/iostream-rawlog.c
--- a/src/lib/iostream-rawlog.c	Fri Nov 22 19:39:13 2013 +0200
+++ b/src/lib/iostream-rawlog.c	Fri Nov 22 22:05:52 2013 +0200
@@ -41,6 +41,9 @@
 	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 @@
 
 	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 @@
 	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;