<div dir="ltr">This smells like we are missing a test.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Jan 25, 2019 at 11:42 AM Geoff Simmons <<a href="mailto:geoff@uplex.de">geoff@uplex.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
commit cdebe44a3cedb925a871ebda020c26438a6b7d60<br>
Author: Geoff Simmons <<a href="mailto:geoff@uplex.de" target="_blank">geoff@uplex.de</a>><br>
Date:   Fri Jan 25 12:31:37 2019 +0100<br>
<br>
    Revert "varnishlog: When writing binary logs, always include Begin/End/Link tags"<br>
<br>
    This reverts commit 1f32c1597a0927e3cd0f728069613e3377572a83.<br>
<br>
    VUT_Arg('i') excludes all records with tags that are not explicitly<br>
    marked as included, so this change had the effect that only records<br>
    with Begin, End and Link, and any other tags that might be mentioned<br>
    for inclusion, get written to binary logs. For u00006.vtc in<br>
    particular, only those three record types were written to the log.<br>
<br>
    What we need here is that the three record types are never excluded,<br>
    in order to get transaction grouping right for reads from binary logs.<br>
<br>
diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c<br>
index b6a76d7df..09f8983d5 100644<br>
--- a/bin/varnishlog/varnishlog.c<br>
+++ b/bin/varnishlog/varnishlog.c<br>
@@ -142,15 +142,10 @@ main(int argc, char * const *argv)<br>
                VUT_Error(vut, 1, "Missing -w option");<br>
<br>
        /* Setup output */<br>
-       if (LOG.A_opt || !LOG.w_arg) {<br>
+       if (LOG.A_opt || !LOG.w_arg)<br>
                vut->dispatch_f = VSL_PrintTransactions;<br>
-       } else {<br>
+       else<br>
                vut->dispatch_f = VSL_WriteTransactions;<br>
-               // inefficient but not crossing API layers<br>
-               AN(VUT_Arg(vut, 'i', "Link"));<br>
-               AN(VUT_Arg(vut, 'i', "Begin"));<br>
-               AN(VUT_Arg(vut, 'i', "End"));<br>
-       }<br>
        if (LOG.w_arg) {<br>
                openout(LOG.a_opt);<br>
                AN(LOG.fo);<br>
_______________________________________________<br>
varnish-commit mailing list<br>
<a href="mailto:varnish-commit@varnish-cache.org" target="_blank">varnish-commit@varnish-cache.org</a><br>
<a href="https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit" rel="noreferrer" target="_blank">https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit</a><br>
</blockquote></div>