r298 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-07-04 16:18:34 +0200 (Tue, 04 Jul 2006)
New Revision: 298

Modified:
   trunk/varnish-cache/bin/varnishd/cache_main.c
Log:
load VCL earlier


Modified: trunk/varnish-cache/bin/varnishd/cache_main.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_main.c	2006-07-04 14:18:02 UTC (rev 297)
+++ trunk/varnish-cache/bin/varnishd/cache_main.c	2006-07-04 14:18:34 UTC (rev 298)
@@ -92,7 +92,9 @@
 	{ NULL }
 };
 
-/*--------------------------------------------------------------------*/
+/*--------------------------------------------------------------------
+ * XXX: Think more about which order we start things
+ */
 
 void
 child_main(void)
@@ -108,6 +110,7 @@
 	setbuf(stderr, NULL);
 	printf("Child starts\n");
 
+	CVCL_Load(heritage.vcl_file, "boot");
 	AZ(pthread_mutex_init(&sessmtx, NULL));
 	VBE_Init();
 	VSL_Init();
@@ -125,7 +128,6 @@
 	if (stevedore->open != NULL)
 		stevedore->open(stevedore);
 
-	CVCL_Load(heritage.vcl_file, "boot");
 	cli = cli_setup(eb, heritage.fds[2], heritage.fds[1], 0, cli_proto);
 
 	evtimer_set(&ev_keepalive, timer_keepalive, NULL);