[master] eabeb64 Use 'S' as instance-id for syslog.

[Poul-Henning Kamp]

commit eabeb64b3695ec62ced4cc56a2da7b626e82bc5a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 29 16:00:55 2018 +0000

    Use 'S' as instance-id for syslog.

diff --git a/bin/varnishtest/tests/h00005.vtc b/bin/varnishtest/tests/h00005.vtc
index 44cf902..3af6aa4 100644
--- a/bin/varnishtest/tests/h00005.vtc
+++ b/bin/varnishtest/tests/h00005.vtc
@@ -8,7 +8,7 @@ server s1 {
 	txresp
 } -start
 
-syslog sl1 -level notice -bind "127.0.0.1:0" {
+syslog S1 -level notice -bind "127.0.0.1:0" {
 	recv
 	recv
 	recv info
@@ -17,7 +17,7 @@ syslog sl1 -level notice -bind "127.0.0.1:0" {
 
 haproxy h1 -conf {
     global
-	log ${sl1_addr}:${sl1_port} local0
+	log ${S1_addr}:${S1_port} local0
 
     defaults
 	log global
@@ -41,5 +41,5 @@ client c1 -connect ${h1_fe_1_sock} {
 	rxresp
 } -run
 
-syslog sl1 -wait
+syslog S1 -wait
 
diff --git a/bin/varnishtest/vtc_syslog.c b/bin/varnishtest/vtc_syslog.c
index 2ef8a85..4221b40 100644
--- a/bin/varnishtest/vtc_syslog.c
+++ b/bin/varnishtest/vtc_syslog.c
@@ -247,7 +247,7 @@ syslog_new(const char *name, struct vtclog *vl)
 {
 	struct syslog_srv *s;
 
-	VTC_CHECK_NAME(vl, name, "Syslog", 's');
+	VTC_CHECK_NAME(vl, name, "Syslog", 'S');
 	ALLOC_OBJ(s, SYSLOG_SRV_MAGIC);
 	AN(s);
 	REPLACE(s->name, name);
@@ -511,16 +511,16 @@ syslog_wait(struct syslog_srv *s)
 
 /* SECTION: syslog syslog
  *
- * Define and interact with syslog instances.
+ * Define and interact with syslog instances (for use with haproxy)
  *
  * To define a syslog server, you'll use this syntax::
  *
- * syslog sNAME
+ *     syslog SNAME
  *
  * Arguments:
  *
- * sNAME
- *     Identify the syslog server with a string which must start with 's'.
+ * SNAME
+ *     Identify the syslog server with a string which must start with 'S'.
  *
  * \-level STRING
  *         Set the default syslog priority level used by any subsequent "recv"