------------------------------------------------------------
revno: 9942
revision-id: squid3@treenet.co.nz-20090831100223-ubi8by062bszjdy2
parent: squid3@treenet.co.nz-20090828034117-tax3g4x87rfu9qbu
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Mon 2009-08-31 22:02:23 +1200
message:
  Author: Tim Starling <tstarling@wikimedia.org>
  Port 2.7: Unique sequence number per log line
  
  Create and enable logging of a unique sequence number per log entry.
  
  Adjusted to 64-bit to handle long Squid up times with very large logged
  line counts.
  
  NP: not quite sure about the incrementation. Write appears to be called
  once per log entry but this is not tested under enough conditions to be
  certain yet. The old lineEnd call from Squid-2 is not present in Squid-3.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20090831100223-ubi8by062bszjdy2
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: f3f93599802fb55f46f5e2c1db8d424e82630044
# timestamp: 2009-08-31 10:06:33 +0000
# source_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20090828034117-\
#   tax3g4x87rfu9qbu
# 
# Begin patch
=== modified file 'doc/release-notes/release-3.2.sgml'
--- doc/release-notes/release-3.2.sgml	2009-08-15 09:42:30 +0000
+++ doc/release-notes/release-3.2.sgml	2009-08-31 10:02:23 +0000
@@ -268,6 +268,9 @@
 <sect1>Changes to existing tags<label id="modifiedtags">
 <p>
 <descrip>
+	<tag>logformat</tag>
+	<p><em>%sn</em> Unique sequence number per log line. Ported from 2.7
+
 	<tag>windows_ipaddrchangemonitor</tag>
 	<p>Now only available to be set in Windows builds.
 
@@ -524,7 +527,6 @@
 
 	<tag>logformat</tag>
 	<p><em>%oa</em> tag not yet ported from 2.7
-	<p><em>%sn</em> tag not yet ported from 2.7
 
 	<tag>max_filedescriptors</tag>
 	<p>Not yet ported from 2.7

=== modified file 'src/access_log.cc'
--- src/access_log.cc	2009-08-23 09:30:49 +0000
+++ src/access_log.cc	2009-08-31 10:02:23 +0000
@@ -397,6 +397,8 @@
     LFT_IO_SIZE_TOTAL,
     LFT_EXT_LOG,
 
+    LFT_SEQUENCE_NUMBER,
+
 #if USE_ADAPTATION
     LTF_ADAPTATION_SUM_XACT_TIMES,
     LTF_ADAPTATION_ALL_XACT_TIMES,
@@ -547,6 +549,7 @@
     {"et", LFT_TAG},
     {"st", LFT_IO_SIZE_TOTAL},
     {"ea", LFT_EXT_LOG},
+    {"sn", LFT_SEQUENCE_NUMBER},
 
     {"%", LFT_PERCENT},
 
@@ -1123,6 +1126,11 @@
 
             break;
 
+        case LFT_SEQUENCE_NUMBER:
+            outoff = logfile->sequence_number;
+            dooff = 1;
+            break;
+
         case LFT_PERCENT:
             out = "%";
 

=== modified file 'src/cf.data.pre'
--- src/cf.data.pre	2009-08-26 11:43:52 +0000
+++ src/cf.data.pre	2009-08-31 10:02:23 +0000
@@ -2400,6 +2400,7 @@
 		<A	Server IP address or peer name
 		la	Local IP address (http_port)
 		lp	Local port number (http_port)
+		sn	Unique sequence number per log line entry
 		ts	Seconds since epoch
 		tu	subsecond time (milliseconds)
 		tl	Local time. Optional strftime format argument

=== modified file 'src/logfile.cc'
--- src/logfile.cc	2009-04-07 13:51:57 +0000
+++ src/logfile.cc	2009-08-31 10:02:23 +0000
@@ -145,6 +145,8 @@
     if (fatal_flag)
         lf->flags.fatal = 1;
 
+    lf->sequence_number = 0;
+
     return lf;
 }
 
@@ -218,6 +220,9 @@
 void
 logfileWrite(Logfile * lf, void *buf, size_t len)
 {
+   /* AYJ: this write gets called once per line? Squid-2 did it in lineEnd which we dont have. */
+   lf->sequence_number++;
+
 #if HAVE_SYSLOG
 
     if (lf->flags.syslog) {

=== modified file 'src/structs.h'
--- src/structs.h	2009-08-23 09:30:49 +0000
+++ src/structs.h	2009-08-31 10:02:23 +0000
@@ -1303,6 +1303,8 @@
     } flags;
 
     int syslog_priority;
+
+    int64_t sequence_number;  ///< Unique sequence number per log line.
 };
 
 class logformat_token;