r3054 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-08-01 11:24:08 +0200 (Fri, 01 Aug 2008)
New Revision: 3054

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_child.c
Log:
Report back to CLI if we cannot start the child due to non-bindable sockets



Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2008-08-01 09:22:21 UTC (rev 3053)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2008-08-01 09:24:08 UTC (rev 3054)
@@ -226,7 +226,7 @@
 /*--------------------------------------------------------------------*/
 
 static void
-start_child(void)
+start_child(struct cli *cli)
 {
 	pid_t pid;
 	unsigned u;
@@ -238,10 +238,15 @@
 		return;
 
 	if (open_sockets() != 0) {
+		child_state = CH_STOPPED;
+		if (cli != NULL) {
+			cli_result(cli, CLIS_CANT);
+			cli_out(cli, "Could not open sockets");
+			return;
+		}
 		REPORT0(LOG_ERR,
 		    "Child start failed: could not open sockets");
-		child_state = CH_STOPPED;
-		return;	/* XXX ?? */
+		return;
 	}
 
 	child_state = CH_STARTING;
@@ -451,7 +456,7 @@
 	REPORT0(LOG_DEBUG, "Child cleanup complete");
 
 	if (child_state == CH_DIED && params->auto_restart)
-		start_child();
+		start_child(NULL);
 	else if (child_state == CH_DIED) {
 		child_state = CH_STOPPED;
 	} else if (child_state == CH_STOPPING)
@@ -531,9 +536,11 @@
 
 	if (!dflag && !mgt_has_vcl()) 
 		REPORT0(LOG_ERR, "No VCL loaded yet");
-	else if (!dflag)
-		start_child();
-	else
+	else if (!dflag) {
+		start_child(NULL);
+		if (child_state == CH_STOPPED)
+			exit(2);
+	} else
 		fprintf(stderr,
 		    "Debugging mode, enter \"start\" to start child\n");
 
@@ -556,9 +563,9 @@
 	if (priv != NULL && child_state == CH_RUNNING)
 		mgt_stop_child();
 	else if (priv == NULL && child_state == CH_STOPPED) {
-		if (mgt_has_vcl())
-			start_child();
-		else {
+		if (mgt_has_vcl()) {
+			start_child(cli);
+		} else {
 			cli_result(cli, CLIS_CANT);
 			cli_out(cli, "No VCL available");
 		}