get rid of the max.vcl_log parameter -- we can estimate one record

per VCL_Log formatter, since they are filtered to match the "header"

doc/varnishevent.rst

@@ -394,12 +394,9 @@ Parameter              CLI Option Description
 ``max.reclen``                    The maximum length of a Varnish log entry in characters. Should be equal to the Varnish   255 (default ``shm_reclen`` in Varnish 4)
                                   parameter ``shm_reclen``.
 ---------------------- ---------- ----------------------------------------------------------------------------------------- -------
-``max.vcl_log``                   The maximum number of VCL_Log entires recorded for a transaction in the Varnish log, used 10
-                                  to estimate the number of records required for transactions when the ``%{VCL_Log}x``
-                                  formatter is specified.
----------------------- ---------- ----------------------------------------------------------------------------------------- -------
-``max.vcl_call``                  The maximum number of VCL_call entires recorded for a transaction in the Varnish log      10
-                                  (used when ``%{Varnish:hitmiss}x`` or ``%{Varnish:handling}x`` are specified).
+``max.vcl_call``                  The maximum number of VCL_call/VCL_return entires recorded for a transaction in the       10
+                                  Varnish log, used to estimate the number of records required for transactions when the
+                                  ``%{Varnish:hitmiss}x`` or ``%{Varnish:handling}x`` formatters are specified.
 ---------------------- ---------- ----------------------------------------------------------------------------------------- -------
 ``log.file``                      Log file for status, warning, debug and error messages, and monitoring statistics. If '-' ``syslog(3)``
                                   is specified, then log messages are written to stdout.

src/config.c

@@ -144,7 +144,6 @@ CONF_Add(const char *lval, const char *rval)
     confVSB("syslog.ident", syslog_ident);
 
     confUnsigned("max.reclen", max_reclen);
-    confUnsigned("max.vcl_log", max_vcl_log);
     confUnsigned("max.vcl_call", max_vcl_call);
     confUnsigned("chunk_size", chunk_size);
     confUnsigned("max.data", max_data);
@@ -233,7 +232,6 @@ CONF_Init(void)
     config.output_bufsiz = BUFSIZ;
 
     config.max_reclen = DEFAULT_MAX_RECLEN;
-    config.max_vcl_log = DEFAULT_MAX_VCL_LOG;
     config.max_vcl_call = DEFAULT_MAX_VCL_CALL;
     config.max_data = DEFAULT_MAX_DATA;
     config.chunk_size = DEFAULT_CHUNK_SIZE;
@@ -348,7 +346,6 @@ CONF_Dump(void)
     confdump("syslog.ident = %s", VSB_data(config.syslog_ident));
     confdump("monitor.interval = %u", config.monitor_interval);
     confdump("max.reclen = %u", config.max_reclen);
-    confdump("max.vcl_log = %u", config.max_vcl_log);
     confdump("max.vcl_call = %u", config.max_vcl_call);
     confdump("max.data = %u", config.max_data);
     confdump("chunk.size = %u", config.chunk_size);

src/format.c

@@ -1289,9 +1289,6 @@ FMT_Estimate_RecsPerTx(void)
             case SLT_VCL_return:
                 recs_per_ctx += config.max_vcl_call;
                 break;
-            case SLT_VCL_Log:
-                recs_per_ctx += config.max_vcl_log;
-                break;
             default:
                 recs_per_ctx++;
             }
@@ -1301,10 +1298,7 @@ FMT_Estimate_RecsPerTx(void)
 
     for (int i = 0; i < MAX_VSL_TAG; i++)
         VSTAILQ_FOREACH(incl, &bincl[i], inclist)
-            if (i == SLT_VCL_Log)
-                recs_per_btx += config.max_vcl_log;
-            else
-                recs_per_btx++;
+            recs_per_btx++;
     if (recs_per_btx > recs_per_tx)
         recs_per_tx = recs_per_btx;
 

src/test/test_format.c

@@ -1506,7 +1506,7 @@ static const char
              i_arg);
 
     recs_per_tx = FMT_Estimate_RecsPerTx();
-    VMASSERT(recs_per_tx == 47, "recs_per_tx(%d) != 47", recs_per_tx);
+    VMASSERT(recs_per_tx == 38, "recs_per_tx(%d) != 38", recs_per_tx);
 
 #define TS_REQ_PAYLOAD "Req: 1429213569.602005 0.000000 0.000000"
     set_record_data(recs[3], c[3], URL_QUERY_PAYLOAD, SLT_ReqURL);
@@ -1574,7 +1574,7 @@ static const char
              i_arg);
 
     recs_per_tx = FMT_Estimate_RecsPerTx();
-    MASSERT(recs_per_tx == 26);
+    MASSERT(recs_per_tx == 17);
 
 #define TS_BEREQ_PAYLOAD "Bereq: 1429210777.728290 0.000048 0.000048"
     tx.type = VSL_t_bereq;

src/varnishevent.h

@@ -56,7 +56,6 @@
 #define DEFAULT_MAX_HEADERS 64	/* http_max_hdr */
 
 #define DEFAULT_MAX_VCL_CALL 10
-#define DEFAULT_MAX_VCL_LOG 10
 
 #define DEFAULT_CHUNK_SIZE 64
 #define DEFAULT_MAX_DATA 4096
@@ -155,7 +154,6 @@ struct config {
 
     unsigned	chunk_size;
 
-    unsigned	max_vcl_log;
     unsigned	max_vcl_call;
 
     unsigned	max_data;