fixup! Include selected overlay type in connection status

weaveworks · Oct 13, 2015 · 15beaa7 · 15beaa7
1 parent 548446d
commit 15beaa7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/router/fastdp.go b/router/fastdp.go
@@ -734,7 +734,7 @@ func (fwd *fastDatapathForwarder) ControlMessage(tag byte, msg []byte) {
 	}
 }
 
-func (fwd *fastDatapathForwarder) OverlayType() string {
+func (fwd *fastDatapathForwarder) DisplayName() string {
 	return "fastdp"
 }
 

diff --git a/router/overlay.go b/router/overlay.go
@@ -92,8 +92,8 @@ type OverlayForwarder interface {
 	// ProtocolOverlayControlMessage for non-sleeve overlays.
 	ControlMessage(tag byte, msg []byte)
 
-	// Type of overlay this forwarder belongs to
-	OverlayType() string
+	// User facing overlay name
+	DisplayName() string
 }
 
 type NullOverlay struct{}
@@ -136,7 +136,7 @@ func (NullOverlay) Stop() {
 func (NullOverlay) ControlMessage(byte, []byte) {
 }
 
-func (NullOverlay) OverlayType() string {
+func (NullOverlay) DisplayName() string {
 	return "null"
 }
 

diff --git a/router/overlay_switch.go b/router/overlay_switch.go
@@ -402,7 +402,7 @@ func (fwd *overlaySwitchForwarder) ControlMessage(tag byte, msg []byte) {
 	}
 }
 
-func (fwd *overlaySwitchForwarder) OverlayType() string {
+func (fwd *overlaySwitchForwarder) DisplayName() string {
 	fwd.lock.Lock()
 	best := fwd.best
 	fwd.lock.Unlock()
@@ -411,5 +411,5 @@ func (fwd *overlaySwitchForwarder) OverlayType() string {
 		return "none"
 	}
 
-	return best.OverlayType()
+	return best.DisplayName()
 }
diff --git a/router/sleeve.go b/router/sleeve.go
@@ -597,7 +597,7 @@ func (fwd *sleeveForwarder) ControlMessage(tag byte, msg []byte) {
 	}
 }
 
-func (fwd *sleeveForwarder) OverlayType() string {
+func (fwd *sleeveForwarder) DisplayName() string {
 	return "sleeve"
 }
 

diff --git a/router/status.go b/router/status.go
@@ -176,7 +176,7 @@ func NewLocalConnectionStatusSlice(cm *ConnectionMaker) []LocalConnectionStatus
 				state = "established"
 			}
 			lc, _ := conn.(*LocalConnection)
-			info := fmt.Sprintf("%-6v %v", lc.forwarder.OverlayType(), conn.Remote())
+			info := fmt.Sprintf("%-6v %v", lc.forwarder.DisplayName(), conn.Remote())
 			slice = append(slice, LocalConnectionStatus{conn.RemoteTCPAddr(), conn.Outbound(), state, info})
 		}
 		for address, target := range cm.targets {
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     }
-    func (fwd *fastDatapathForwarder) OverlayType() string {
+    func (fwd *fastDatapathForwarder) DisplayName() string {
     	return "fastdp"
     }
@@ Expand Down @@