[master] f4ee973 Join the long-doc strings with "\n"
Poul-Henning Kamp
phk at FreeBSD.org
Fri May 26 23:23:05 CEST 2017
commit f4ee973bd20a2abf4f56bc7c6c551b1461a4eca8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Fri May 26 20:58:49 2017 +0000
Join the long-doc strings with "\n"
diff --git a/bin/varnishd/lck.vsc b/bin/varnishd/lck.vsc
index 936df89..91da95a 100644
--- a/bin/varnishd/lck.vsc
+++ b/bin/varnishd/lck.vsc
@@ -6,7 +6,7 @@
XXX: include/tbl/vsc_fields.h
.. varnish_vsc_begin:: lck
- :oneliner: LOCK COUNTERS (LCK.*)
+ :oneliner: Lock Counters
.. varnish_vsc:: creat
:type: counter
diff --git a/bin/varnishd/mempool.vsc b/bin/varnishd/mempool.vsc
index b947031..082c3b3 100644
--- a/bin/varnishd/mempool.vsc
+++ b/bin/varnishd/mempool.vsc
@@ -6,7 +6,7 @@
XXX: include/tbl/vsc_fields.h
.. varnish_vsc_begin:: mempool
- :oneliner: MEMORY POOL COUNTERS (MEMPOOL.*)
+ :oneliner: Memory Pool Counters
.. varnish_vsc:: live
:type: gauge
diff --git a/bin/varnishd/mgt.vsc b/bin/varnishd/mgt.vsc
index d1d7984..3525177 100644
--- a/bin/varnishd/mgt.vsc
+++ b/bin/varnishd/mgt.vsc
@@ -6,8 +6,7 @@
XXX: include/tbl/vsc_fields.h
.. varnish_vsc_begin:: mgt
- :class: MGT
- :oneliner: MANAGEMENT PROCESS COUNTERS (MGT.*)
+ :oneliner: Management Process Counters
.. varnish_vsc:: uptime
:type: counter
diff --git a/bin/varnishd/sma.vsc b/bin/varnishd/sma.vsc
index da4e18a..e38b148 100644
--- a/bin/varnishd/sma.vsc
+++ b/bin/varnishd/sma.vsc
@@ -6,7 +6,7 @@
XXX: include/tbl/vsc_fields.h
.. varnish_vsc_begin:: sma
- :oneliner: MALLOC STORAGE COUNTERS (SMA.*)
+ :oneliner: Malloc Stevedore Counters
.. varnish_vsc:: c_req
:type: counter
diff --git a/bin/varnishd/smf.vsc b/bin/varnishd/smf.vsc
index 29f38d9..fb4d46d 100644
--- a/bin/varnishd/smf.vsc
+++ b/bin/varnishd/smf.vsc
@@ -6,7 +6,7 @@
XXX: include/tbl/vsc_fields.h
.. varnish_vsc_begin:: smf
- :oneliner: FILE STORAGE COUNTERS (SMF.*)
+ :oneliner: File Stevedore Counters
.. varnish_vsc:: c_req
:type: counter
diff --git a/bin/varnishd/vbe.vsc b/bin/varnishd/vbe.vsc
index f959ca9..23ac573 100644
--- a/bin/varnishd/vbe.vsc
+++ b/bin/varnishd/vbe.vsc
@@ -6,7 +6,7 @@
XXX: include/tbl/vsc_fields.h
.. varnish_vsc_begin:: vbe
- :oneliner: BACKEND COUNTERS (VBE.*)
+ :oneliner: Backend Counters
.. varnish_vsc:: happy
:type: bitmap
diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py
index 29aeb5c..0a4a17b 100644
--- a/lib/libvcc/vsctool.py
+++ b/lib/libvcc/vsctool.py
@@ -74,7 +74,7 @@ class vscset(object):
dd["version"] = "1"
dd["name"] = self.name
dd["1line"] = self.head.param["oneliner"].strip()
- dd["docs"] = self.head.getdoc()
+ dd["docs"] = "\n".join(self.head.getdoc())
dd["elements"] = len(self.mbrs)
el = collections.OrderedDict()
dd["elem"] = el
@@ -88,7 +88,7 @@ class vscset(object):
ed["type"] = i.param["type"]
ed["level"] = i.param["level"]
ed["1line"] = i.param["oneliner"].strip()
- ed["docs"] = i.getdoc()
+ ed["docs"] = "\n".join(i.getdoc())
s=json.dumps(dd, separators=(",",":")) + "\0"
fo.write("\nstatic const size_t vsc_%s_jsonlen = %dL;\n" %
(self.name, len(s)))
More information about the varnish-commit
mailing list