http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94287

Revision: 94287
Author:   asher
Date:     2011-08-11 21:31:26 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
change varnishncsa timestamp to better match squid logs (minus milliseconds due 
to strftime struct)

Modified Paths:
--------------
    trunk/debs/varnish3/debian/changelog
    trunk/debs/varnish3/debian/patches/01-varnishncsa-udp.dpatch

Modified: trunk/debs/varnish3/debian/changelog
===================================================================
--- trunk/debs/varnish3/debian/changelog        2011-08-11 21:10:30 UTC (rev 
94286)
+++ trunk/debs/varnish3/debian/changelog        2011-08-11 21:31:26 UTC (rev 
94287)
@@ -1,3 +1,9 @@
+varnish3 (3.0.0-1wmf2) lucid; urgency=low
+
+  * Change time format to match squid (minus milliseconds) 
+
+ -- Asher Feldman <[email protected]>  Thu, 11 Aug 2011 21:28:29 +0000
+
 varnish3 (3.0.0-1wmf1) lucid; urgency=low
 
   * udp log patch

Modified: trunk/debs/varnish3/debian/patches/01-varnishncsa-udp.dpatch
===================================================================
--- trunk/debs/varnish3/debian/patches/01-varnishncsa-udp.dpatch        
2011-08-11 21:10:30 UTC (rev 94286)
+++ trunk/debs/varnish3/debian/patches/01-varnishncsa-udp.dpatch        
2011-08-11 21:31:26 UTC (rev 94287)
@@ -1,12 +1,13 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-varnishncsa-udp.dpatch by <[email protected]>, 
<[email protected]>
+## 01-varnishncsa-udp.dpatch by  <[email protected]>
+##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: log2udp daemon for varnish, with sequence numbers
+## DP: add udp multicast support, seq number
 
 @DPATCH@
-diff -urNad varnish-3.0.0~/bin/varnishncsa/varnishncsa.c 
varnish-3.0.0/bin/varnishncsa/varnishncsa.c
---- varnish-3.0.0~/bin/varnishncsa/varnishncsa.c        2011-07-14 
05:13:45.000000000 -0700
-+++ varnish-3.0.0/bin/varnishncsa/varnishncsa.c         2011-07-14 
05:06:58.000000000 -0700
+
+--- varnish3-3.0.0~/bin/varnishncsa/varnishncsa.c      2011-08-09 
23:55:17.000000000 +0000
++++ varnish3-3.0.0/bin/varnishncsa/varnishncsa.c       2011-08-11 
21:22:37.000000000 +0000
 @@ -79,6 +79,13 @@
  #include "varnishapi.h"
  #include "base64.h"
@@ -41,6 +42,15 @@
  
                case 'q':
                        fprintf(fo, "%s", lp->df_q ? lp->df_q : "");
+@@ -594,7 +607,7 @@
+ 
+               case 't':
+                       /* %t */
+-                      strftime(tbuf, sizeof tbuf, "[%d/%b/%Y:%T %z]", 
&lp->df_t);
++                      strftime(tbuf, sizeof tbuf, "%Y-%m-%dT%T", &lp->df_t);  
/* 2011-08-11T21:17:01 - no ms from strftim */
+                       fprintf(fo, "%s", tbuf);
+                       break;
+ 
 @@ -695,12 +708,54 @@
  open_log(const char *ofn, int append)
  {


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to