From 9704899dfd2f17ae308323f3fb8da25babc100b0 Mon Sep 17 00:00:00 2001
From: Ev Kontsevoy <ev@kontsevoy.com>
Date: Sat, 27 Feb 2016 13:34:03 -0800
Subject: [PATCH] Brought back "list nodes" functionality to tctl

---
 lib/reversetunnel/srv.go |  2 +-
 tool/tctl/main.go        | 20 +++++++++-----------
 web/dist/app/app         |  1 +
 3 files changed, 11 insertions(+), 12 deletions(-)
 create mode 120000 web/dist/app/app

diff --git a/lib/reversetunnel/srv.go b/lib/reversetunnel/srv.go
index d295ea0aace..b1acfe08f0d 100644
--- a/lib/reversetunnel/srv.go
+++ b/lib/reversetunnel/srv.go
@@ -685,7 +685,7 @@ func (s *tunnelSite) handleHeartbeat(ch ssh.Channel, reqC <-chan *ssh.Request) {
 				s.log.Infof("agent disconnected")
 				return
 			}
-			s.log.Debugf("ping")
+			//s.log.Debugf("ping")
 			s.lastActive = time.Now()
 		}
 	}()
diff --git a/tool/tctl/main.go b/tool/tctl/main.go
index 3c622825875..b23d17cb4b9 100644
--- a/tool/tctl/main.go
+++ b/tool/tctl/main.go
@@ -224,18 +224,16 @@ func (u *NodeCommand) ListActive(client *auth.TunClient) error {
 		if len(nodes) == 0 {
 			return t.String()
 		}
-		/*
-			for _, n := range nodes {
-				labels := make(configure.KeyVal, len(n.Labels)+len(n.CmdLabels))
-				for key, val := range n.Labels {
-					labels[key] = val
-				}
-				for key, val := range n.CmdLabels {
-					labels[key] = val.Result
-				}
-				fmt.Fprintf(t, "%v\t%v\t%v\n", n.Hostname, n.Addr, labels.String())
+		for _, n := range nodes {
+			labels := []string{}
+			for key, val := range n.Labels {
+				labels = append(labels, fmt.Sprintf("%s:%s", key, val))
 			}
-		*/
+			for key, val := range n.CmdLabels {
+				labels = append(labels, fmt.Sprintf("%s:%s", key, val.Result))
+			}
+			fmt.Fprintf(t, "%v\t%v\t%v\n", n.Hostname, n.Addr, strings.Join(labels, ","))
+		}
 		return t.String()
 	}
 	fmt.Printf(nodesView(nodes))
diff --git a/web/dist/app/app b/web/dist/app/app
new file mode 120000
index 00000000000..13a90ff41eb
--- /dev/null
+++ b/web/dist/app/app
@@ -0,0 +1 @@
+/home/ekontsevoy/go/src/github.com/gravitational/teleport/web/dist/app
\ No newline at end of file