Commit f4ee973b authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Join the long-doc strings with "\n"

parent fd55b85c
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment