get rid of obsolete config parameters

src/config.c

@@ -138,12 +138,9 @@ CONF_Add(const char *lval, const char *rval)
     confUnsigned("max.vcl_log", max_vcl_log);
     confUnsigned("max.vcl_call", max_vcl_call);
     confUnsigned("max.timestamp", max_vcl_call);
-    confUnsigned("max.fd", max_fd);
     confUnsigned("max.data", max_data);
     confUnsigned("monitor.interval", monitor_interval);
     confUnsigned("output.bufsiz", output_bufsiz);
-    confUnsigned("housekeep.interval", housekeep_interval);
-    confUnsigned("ttl", ttl);
     confUnsigned("append", append);
 
     if (strcmp(lval, "syslog.facility") == 0) {
@@ -236,11 +233,8 @@ CONF_Init(void)
     config.max_vcl_log = DEFAULT_MAX_VCL_LOG;
     config.max_vcl_call = DEFAULT_MAX_VCL_CALL;
     config.max_timestamp = DEFAULT_MAX_TIMESTAMP;
-    config.max_fd = DEFAULT_MAX_FD;
     config.max_data = DEFAULT_MAX_DATA;
     config.chunk_size = DEFAULT_CHUNK_SIZE;
-    config.housekeep_interval = DEFAULT_HOUSEKEEP_INTERVAL;
-    config.ttl = DEFAULT_TTL;
     config.idle_pause = DEFAULT_IDLE_PAUSE;
 
     /* Default is stdout */
@@ -337,10 +331,7 @@ CONF_Dump(void)
     confdump("max.vcl_log = %u", config.max_vcl_log);
     confdump("max.vcl_call = %u", config.max_vcl_call);
     confdump("max.timestamp = %u", config.max_timestamp);
-    confdump("max.fd = %u", config.max_fd);
     confdump("max.data = %u", config.max_data);
-    confdump("housekeep.interval = %u", config.housekeep_interval);
-    confdump("ttl = %u", config.ttl);
     confdump("idle.pause = %d", config.idle_pause);
     confdump("output.bufsiz = %u", config.output_bufsiz);
     confdump("user = %s", config.user_name);

src/varnishevent.h

@@ -48,7 +48,7 @@
 #define B(txtype) ((txtype) == VSL_t_bereq)
 #define R(txtype) ((txtype) == VSL_t_raw)
 
-/* Defaults from Varnish 3.0.3 */
+/* Defaults from Varnish 4.0.3 */
 #define DEFAULT_MAX_RECLEN 255	/* shm_reclen */
 #define DEFAULT_MAX_HEADERS 64	/* http_max_hdr */
 
@@ -57,15 +57,11 @@
 #define DEFAULT_MAX_TIMESTAMP 8
 
 #define DEFAULT_CHUNK_SIZE 64
-#define DEFAULT_MAX_FD 1024
 #define DEFAULT_MAX_DATA 4096
 #define DEFAULT_PID_FILE "/var/run/varnishevent.pid"
 
 #define DEFAULT_IDLE_PAUSE 0.01
 
-#define DEFAULT_HOUSEKEEP_INTERVAL 10
-#define DEFAULT_TTL 120
-
 #define MAX_VSL_TAG SLT__MAX
 
 #define DEFAULT_CFORMAT \
@@ -172,12 +168,8 @@ struct config {
     unsigned	max_vcl_call;
     unsigned	max_timestamp;
 
-    unsigned	max_fd;
     unsigned	max_data;    
 
-    unsigned	housekeep_interval;
-    unsigned	ttl;
-    
     size_t	output_bufsiz;
     
     char        user_name[BUFSIZ];