Browse Source

Minor readability edits

Rod Hynes 9 years ago
parent
commit
1a129e7a4d
1 changed files with 9 additions and 8 deletions
  1. 9 8
      psiphon/server/tunnelServer.go

+ 9 - 8
psiphon/server/tunnelServer.go

@@ -470,24 +470,25 @@ func (sshServer *sshServer) getLoadStats() (ProtocolStats, RegionStats) {
 	}
 	}
 
 
 	zeroProtocolStats := func() map[string]map[string]int64 {
 	zeroProtocolStats := func() map[string]map[string]int64 {
-		zeroProtocolStats := make(map[string]map[string]int64)
-		zeroProtocolStats["ALL"] = zeroStats()
+		stats := make(map[string]map[string]int64)
+		stats["ALL"] = zeroStats()
 		for tunnelProtocol, _ := range sshServer.support.Config.TunnelProtocolPorts {
 		for tunnelProtocol, _ := range sshServer.support.Config.TunnelProtocolPorts {
-			zeroProtocolStats[tunnelProtocol] = zeroStats()
+			stats[tunnelProtocol] = zeroStats()
 		}
 		}
-		return zeroProtocolStats
+		return stats
 	}
 	}
 
 
-	// [<protocol or ALL>][<stat name] -> count
+	// [<protocol or ALL>][<stat name>] -> count
 	protocolStats := zeroProtocolStats()
 	protocolStats := zeroProtocolStats()
 
 
-	// [<region][<protocol or ALL>][<stat name] -> count
+	// [<region][<protocol or ALL>][<stat name>] -> count
 	regionStats := make(RegionStats)
 	regionStats := make(RegionStats)
 
 
 	// Note: as currently tracked/counted, each established client is also an accepted client
 	// Note: as currently tracked/counted, each established client is also an accepted client
 
 
 	for tunnelProtocol, regionAcceptedClientCounts := range sshServer.acceptedClientCounts {
 	for tunnelProtocol, regionAcceptedClientCounts := range sshServer.acceptedClientCounts {
 		for region, acceptedClientCount := range regionAcceptedClientCounts {
 		for region, acceptedClientCount := range regionAcceptedClientCounts {
+
 			if acceptedClientCount > 0 {
 			if acceptedClientCount > 0 {
 				if regionStats[region] == nil {
 				if regionStats[region] == nil {
 					regionStats[region] = zeroProtocolStats()
 					regionStats[region] = zeroProtocolStats()
@@ -513,8 +514,6 @@ func (sshServer *sshServer) getLoadStats() (ProtocolStats, RegionStats) {
 			regionStats[region] = zeroProtocolStats()
 			regionStats[region] = zeroProtocolStats()
 		}
 		}
 
 
-		// Note: can't sum trafficState.peakConcurrentPortForwardCount to get a global peak
-
 		stats := []map[string]int64{
 		stats := []map[string]int64{
 			protocolStats["ALL"],
 			protocolStats["ALL"],
 			protocolStats[tunnelProtocol],
 			protocolStats[tunnelProtocol],
@@ -525,6 +524,8 @@ func (sshServer *sshServer) getLoadStats() (ProtocolStats, RegionStats) {
 
 
 			stat["established_clients"] += 1
 			stat["established_clients"] += 1
 
 
+			// Note: can't sum trafficState.peakConcurrentPortForwardCount to get a global peak
+
 			stat["dialing_tcp_port_forwards"] += client.tcpTrafficState.concurrentDialingPortForwardCount
 			stat["dialing_tcp_port_forwards"] += client.tcpTrafficState.concurrentDialingPortForwardCount
 			stat["tcp_port_forwards"] += client.tcpTrafficState.concurrentPortForwardCount
 			stat["tcp_port_forwards"] += client.tcpTrafficState.concurrentPortForwardCount
 			stat["total_tcp_port_forwards"] += client.tcpTrafficState.totalPortForwardCount
 			stat["total_tcp_port_forwards"] += client.tcpTrafficState.totalPortForwardCount