r479 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-07-14 15:52:11 +0200 (Fri, 14 Jul 2006)
New Revision: 479

Modified:
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
Use space to separate host and port in backend spec.

Polish usage message a bit.


Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2006-07-14 13:33:26 UTC (rev 478)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2006-07-14 13:52:11 UTC (rev 479)
@@ -118,7 +118,7 @@
 	 * XXX: a bug for a backend to not reply at that time, so then
 	 * XXX: again: we should check it here in the "trivial" case.
 	 */
-	p = strchr(bflag, ':');
+	p = strchr(bflag, ' ');
 	if (p != NULL) {
 		q = p + 1;
 	} else {
@@ -444,17 +444,43 @@
 {
 	fprintf(stderr, "usage: varnishd [options]\n");
 	fprintf(stderr, "    %-28s # %s\n", "-b backend",
-	    "backend IP or hostname");
+	    "backend location");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "   -b <hostname_or_IP>");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "   -b '<hostname_or_IP> <port_or_service>'");
 	fprintf(stderr, "    %-28s # %s\n", "-d", "debug");
 	fprintf(stderr, "    %-28s # %s\n", "-f file", "VCL_file");
 	fprintf(stderr, "    %-28s # %s\n",
 	    "-h kind[,hashoptions]", "Hash specification");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -h simple_list");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -h classic  [default]");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -h classic,<buckets>");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -h classic,<buckets>,<buckets_per_mutex>");
 	fprintf(stderr, "    %-28s # %s\n", "-p number", "TCP listen port");
 	fprintf(stderr, "    %-28s # %s\n",
 	    "-s kind[,storageoptions]", "Backend storage specification");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -s malloc");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -s file  [default: use /tmp]");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -s file,<dir_or_file>");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -s file,<dir_or_file>,<size>");
 	fprintf(stderr, "    %-28s # %s\n", "-t", "Default TTL");
 	fprintf(stderr, "    %-28s # %s\n", "-w int[,int[,int]]",
-	    "Number of worker threads (fixed/{min,max}/{min/max/timeout})");
+	    "Number of worker threads");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -w <fixed_count>");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -w min,max");
+	fprintf(stderr, "    %-28s # %s\n", "",
+	    "  -w min,max,timeout [default: -w1,INF,10]");
 #if 0
 	-c clusterid at cluster_controller
 	-m memory_limit