r852 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-08-20 17:12:13 +0200 (Sun, 20 Aug 2006)
New Revision: 852

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_vcc.c
Log:
Don't chat up non-running childs.


Modified: trunk/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2006-08-20 15:11:53 UTC (rev 851)
+++ trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2006-08-20 15:12:13 UTC (rev 852)
@@ -309,7 +309,8 @@
 	(void)priv;
 	vp = mcf_find_vcl(cli, av[2]);
 	if (vp != NULL && vp->active == 0) {
-		if (mgt_cli_askchild(&status, &p, "config.use %s\n", av[2])) {
+		if (child_pid >= 0 &&
+		    mgt_cli_askchild(&status, &p, "config.use %s\n", av[2])) {
 			cli_result(cli, status);
 			cli_out(cli, "%s", p);
 			free(p);
@@ -338,7 +339,8 @@
 		cli_result(cli, CLIS_PARAM);
 		cli_out(cli, "Cannot discard active VCL program\n");
 	} else if (vp != NULL) {
-		if (mgt_cli_askchild(&status, &p,
+		if (child_pid >= 0 &&
+		    mgt_cli_askchild(&status, &p,
 		    "config.discard %s\n", av[2])) {
 			cli_result(cli, status);
 			cli_out(cli, "%s", p);