r4462 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2010-01-15 14:22:01 +0100 (Fri, 15 Jan 2010)
New Revision: 4462

Modified:
   trunk/varnish-cache/bin/varnishd/mgt.h
   trunk/varnish-cache/bin/varnishd/mgt_vcc.c
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
Make add info to the boot VCL about where it came from, -b or -f argument.



Modified: trunk/varnish-cache/bin/varnishd/mgt.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt.h	2010-01-14 13:44:58 UTC (rev 4461)
+++ trunk/varnish-cache/bin/varnishd/mgt.h	2010-01-15 13:22:01 UTC (rev 4462)
@@ -66,7 +66,7 @@
 
 /* mgt_vcc.c */
 void mgt_vcc_init(void);
-int mgt_vcc_default(const char *bflag, char *vcl, int Cflag);
+int mgt_vcc_default(const char *bflag, const char *f_arg, char *vcl, int Cflag);
 int mgt_push_vcls_and_start(unsigned *status, char **p);
 int mgt_has_vcl(void);
 extern char *mgt_cc_cmd;

Modified: trunk/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2010-01-14 13:44:58 UTC (rev 4461)
+++ trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2010-01-15 13:22:01 UTC (rev 4462)
@@ -325,12 +325,13 @@
 /*--------------------------------------------------------------------*/
 
 int
-mgt_vcc_default(const char *b_arg, char *vcl, int C_flag)
+mgt_vcc_default(const char *b_arg, const char *f_arg, char *vcl, int C_flag)
 {
 	char *addr, *port;
 	char *vf;
 	struct vsb *sb;
 	struct vclprog *vp;
+	char buf[BUFSIZ];
 
 	if (b_arg != NULL) {
 		AZ(vcl);
@@ -363,6 +364,9 @@
 		free(addr);
 		free(port);
 		AN(vcl);
+		bprintf(buf, "boot (-b %s)", b_arg);
+	} else {
+		brintf(buf, "boot (-f %s)", f_arg);
 	}
 
 	vf = mgt_VccCompile(&sb, vcl, C_flag);
@@ -379,7 +383,7 @@
 		fprintf(stderr, "\nVCL compilation failed\n");
 		return (1);
 	}
-	vp = mgt_vcc_add("boot", vf);
+	vp = mgt_vcc_add(buf, vf);
 	vp->active = 1;
 	return (0);
 }

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2010-01-14 13:44:58 UTC (rev 4461)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2010-01-15 13:22:01 UTC (rev 4462)
@@ -727,7 +727,7 @@
 	}
 
 	if (b_arg != NULL || f_arg != NULL)
-		if (mgt_vcc_default(b_arg, vcl, C_flag))
+		if (mgt_vcc_default(b_arg, f_arg, vcl, C_flag))
 			exit (2);
 
 	if (C_flag)