You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2015/07/23 09:02:53 UTC
[1/2] trafficserver git commit: TS-3773: HostDB view all: add more
detail for RR records
Repository: trafficserver
Updated Branches:
refs/heads/master 392d3abc9 -> d3a7f1b2f
TS-3773: HostDB view all: add more detail for RR records
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/08b5af2f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/08b5af2f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/08b5af2f
Branch: refs/heads/master
Commit: 08b5af2f89f4b05bca7a0b59076eae1c8894e163
Parents: f5e521e
Author: Brian Geffon <br...@apache.org>
Authored: Thu Jul 23 00:02:27 2015 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Thu Jul 23 00:02:27 2015 -0700
----------------------------------------------------------------------
iocore/hostdb/HostDB.cc | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/08b5af2f/iocore/hostdb/HostDB.cc
----------------------------------------------------------------------
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index 99a8480..0c91ea3 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -2430,7 +2430,20 @@ struct ShowHostDB : public ShowCont {
{
if (event == EVENT_INTERVAL) {
HostDBInfo *r = reinterpret_cast<HostDBInfo *>(e);
- return showOne(r, false, event, e);
+ showOne(r,false,event,e);
+ if (r->round_robin) {
+ HostDBRoundRobin *rr_data = r->rr();
+ if (rr_data) {
+ CHECK_SHOW(show("<table border=1>\n"));
+ CHECK_SHOW(show("<tr><td>%s</td><td>%d</td></tr>\n", "Total", rr_data->rrcount));
+ CHECK_SHOW(show("<tr><td>%s</td><td>%d</td></tr>\n", "Good", rr_data->good));
+ CHECK_SHOW(show("<tr><td>%s</td><td>%d</td></tr>\n", "Current", rr_data->current));
+ CHECK_SHOW(show("</table>\n"));
+
+ for (int i = 0; i < rr_data->rrcount; i++)
+ showOne(&rr_data->info[i], true, event, e);
+ }
+ }
} else if (event == EVENT_DONE) {
return complete(event, e);
} else {
[2/2] trafficserver git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Posted by br...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d3a7f1b2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d3a7f1b2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d3a7f1b2
Branch: refs/heads/master
Commit: d3a7f1b2f847feee3c17f1eaaa91df50ffef5e25
Parents: 08b5af2 392d3ab
Author: Brian Geffon <br...@apache.org>
Authored: Thu Jul 23 00:02:43 2015 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Thu Jul 23 00:02:43 2015 -0700
----------------------------------------------------------------------
proxy/hdrs/HdrHeap.cc | 2 +-
proxy/hdrs/MIME.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------