------------------------------------------------------------ revno: 13072 revision-id: squid3@treenet.co.nz-20131030061730-e13nfkuy2tslmwqg parent: squid3@treenet.co.nz-20131027214656-cstvs2h5olmyxfye committer: Amos Jeffries branch nick: trunk timestamp: Wed 2013-10-30 00:17:30 -0600 message: CacheMgr: normalize pconn report output - table rows start with TAB - table cell delimiter is TAB - table header cells start with TAB SP ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131030061730-e13nfkuy2tslmwqg # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 6a1ce79fc02f5e3337a40f5510e2ccf1b4cd387b # timestamp: 2013-10-30 06:55:48 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20131027214656-\ # cstvs2h5olmyxfye # # Begin patch === modified file 'src/pconn.cc' --- src/pconn.cc 2013-06-03 14:05:16 +0000 +++ src/pconn.cc 2013-10-30 06:17:30 +0000 @@ -347,16 +347,15 @@ storeAppendPrintf(e, "%s persistent connection counts:\n" "\n" - "\treq/\n" - "\tconn count\n" - "\t---- ---------\n", + "\t Requests\t Connection Count\n" + "\t --------\t ----------------\n", descr); for (int i = 0; i < PCONN_HIST_SZ; ++i) { if (hist[i] == 0) continue; - storeAppendPrintf(e, "\t%4d %9d\n", i, hist[i]); + storeAppendPrintf(e, "\t%d\t%d\n", i, hist[i]); } } @@ -368,7 +367,7 @@ int i = 0; for (hash_link *walker = hid->next; walker; walker = hash_next(hid)) { - storeAppendPrintf(e, "\t item %5d: %s\n", i, (char *)(walker->key)); + storeAppendPrintf(e, "\t item %d:\t%s\n", i, (char *)(walker->key)); ++i; } }