[master] 2222e6b Move VCA_Shutdown() call to the main code

Poul-Henning Kamp phk at FreeBSD.org
Mon Feb 8 12:45:11 CET 2016


commit 2222e6bd38c67d2e0ba2b38627cc8bcce6ceb6c2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Feb 8 11:40:02 2016 +0000

    Move VCA_Shutdown() call to the main code

diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index bc2302e..da8ee40 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -105,7 +105,6 @@ CLI_Run(void)
 		i = VCLS_Poll(cls, -1);
 	} while(i > 0);
 	VSL(SLT_CLI, 0, "EOF on CLI connection, worker stops");
-	VCA_Shutdown();
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index 8d2e8f0..78ab1d2 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -269,6 +269,7 @@ child_main(void)
 
 	CLI_Run();
 
+	VCA_Shutdown();
 	BAN_Shutdown();
 	STV_close();
 



More information about the varnish-commit mailing list