[4.1] dc7689e Move VCA_Shutdown() call to the main code
Lasse Karstensen
lkarsten at varnish-software.com
Thu Feb 11 17:14:33 CET 2016
commit dc7689ea068c2ce4003af900bd37a83fe4fe66df
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 3ba8cdd..1855567 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 83de0cd..2609d7b 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -261,6 +261,7 @@ child_main(void)
CLI_Run();
+ VCA_Shutdown();
BAN_Shutdown();
STV_close();
More information about the varnish-commit
mailing list