You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/10/28 21:06:58 UTC
[35/50] incubator-trafficcontrol git commit: Fix TM2 to simplify
single var ranges
Fix TM2 to simplify single var ranges
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b1bd9520
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b1bd9520
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b1bd9520
Branch: refs/heads/master
Commit: b1bd95205e40b26435af352e0c5f55108fa46c67
Parents: 32358a6
Author: Robert Butts <ro...@gmail.com>
Authored: Thu Oct 20 16:18:31 2016 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Fri Oct 28 15:04:12 2016 -0600
----------------------------------------------------------------------
.../traffic_monitor/deliveryservice/stat.go | 4 ++--
.../traffic_monitor/deliveryservicedata/stat.go | 2 +-
.../experimental/traffic_monitor/manager/datarequest.go | 12 ++++++------
.../traffic_monitor/manager/monitorconfig.go | 2 +-
.../traffic_monitor/manager/polledcaches.go | 10 +++++-----
.../traffic_monitor/trafficopsdata/trafficopsdata.go | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b1bd9520/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go b/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
index f80fcdf..16330b6 100644
--- a/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
+++ b/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
@@ -6,8 +6,8 @@ import (
"github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/cache"
dsdata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/deliveryservicedata"
"github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/enum"
- "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/srvhttp"
"github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/peer"
+ "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/srvhttp"
todata "github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental/traffic_monitor/trafficopsdata"
"net/url"
"strconv"
@@ -374,7 +374,7 @@ func addPerSecStats(statHistory map[enum.CacheName][]cache.Result, dsStats Stats
func CreateStats(statHistory map[enum.CacheName][]cache.Result, toData todata.TOData, crStates peer.Crstates, lastStats LastStats, now time.Time) (Stats, LastStats, error) {
start := time.Now()
dsStats := NewStats()
- for deliveryService, _ := range toData.DeliveryServiceServers {
+ for deliveryService := range toData.DeliveryServiceServers {
if deliveryService == "" {
log.Errorf("EMPTY CreateStats deliveryService")
continue
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b1bd9520/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go b/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
index 3ddc2c8..8eb4230 100644
--- a/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
+++ b/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
@@ -101,7 +101,7 @@ func (a StatCommon) CacheReporting(name enum.CacheName) (bool, bool) {
}
func (a StatCommon) CachesReportingNames() []enum.CacheName {
names := make([]enum.CacheName, 0, len(a.CachesReporting))
- for name, _ := range a.CachesReporting {
+ for name := range a.CachesReporting {
names = append(names, name)
}
return names
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b1bd9520/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go b/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go
index e754f89..1dcf198 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go
@@ -73,7 +73,7 @@ func (f *CacheStatFilter) UseStat(statName string) bool {
_, ok := f.statsToUse[statName]
return ok
}
- for statToUse, _ := range f.statsToUse {
+ for statToUse := range f.statsToUse {
if strings.Contains(statName, statToUse) {
return true
}
@@ -102,7 +102,7 @@ func NewCacheStatFilter(params url.Values, cacheTypes map[enum.CacheName]enum.Ca
if len(params) > len(validParams) {
return nil, fmt.Errorf("invalid query parameters")
}
- for param, _ := range params {
+ for param := range params {
if _, ok := validParams[param]; !ok {
return nil, fmt.Errorf("invalid query parameter '%v'", param)
}
@@ -189,7 +189,7 @@ func (f *DSStatFilter) UseStat(statName string) bool {
_, ok := f.statsToUse[statName]
return ok
}
- for statToUse, _ := range f.statsToUse {
+ for statToUse := range f.statsToUse {
if strings.Contains(statName, statToUse) {
return true
}
@@ -218,7 +218,7 @@ func NewDSStatFilter(params url.Values, dsTypes map[enum.DeliveryServiceName]enu
if len(params) > len(validParams) {
return nil, fmt.Errorf("invalid query parameters")
}
- for param, _ := range params {
+ for param := range params {
if _, ok := validParams[param]; !ok {
return nil, fmt.Errorf("invalid query parameter '%v'", param)
}
@@ -308,7 +308,7 @@ func (f *PeerStateFilter) UseCache(name enum.CacheName) bool {
_, ok := f.cachesToUse[name]
return ok
}
- for cacheToUse, _ := range f.cachesToUse {
+ for cacheToUse := range f.cachesToUse {
if strings.Contains(string(name), string(cacheToUse)) {
return true
}
@@ -338,7 +338,7 @@ func NewPeerStateFilter(params url.Values, cacheTypes map[enum.CacheName]enum.Ca
if len(params) > len(validParams) {
return nil, fmt.Errorf("invalid query parameters")
}
- for param, _ := range params {
+ for param := range params {
if _, ok := validParams[param]; !ok {
return nil, fmt.Errorf("invalid query parameter '%v'", param)
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b1bd9520/traffic_monitor/experimental/traffic_monitor/manager/monitorconfig.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/monitorconfig.go b/traffic_monitor/experimental/traffic_monitor/manager/monitorconfig.go
index fa24f04..2016116 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/monitorconfig.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/monitorconfig.go
@@ -172,7 +172,7 @@ func monitorConfigListen(
localStates.SetDeliveryService(enum.DeliveryServiceName(ds.XMLID), peer.Deliveryservice{IsAvailable: false, DisabledLocations: []enum.CacheName{}}) // important to initialize DisabledLocations, so JSON is `[]` not `null`
}
}
- for ds, _ := range localStates.Get().Deliveryservice {
+ for ds := range localStates.Get().Deliveryservice {
if _, exists := monitorConfig.DeliveryService[string(ds)]; !exists {
localStates.DeleteDeliveryService(ds)
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b1bd9520/traffic_monitor/experimental/traffic_monitor/manager/polledcaches.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/manager/polledcaches.go b/traffic_monitor/experimental/traffic_monitor/manager/polledcaches.go
index 9b66a8d..f22279d 100644
--- a/traffic_monitor/experimental/traffic_monitor/manager/polledcaches.go
+++ b/traffic_monitor/experimental/traffic_monitor/manager/polledcaches.go
@@ -47,17 +47,17 @@ func (t *UnpolledCachesThreadsafe) setUnpolledCaches(v map[enum.CacheName]struct
func (t *UnpolledCachesThreadsafe) SetNewCaches(newCaches map[enum.CacheName]struct{}) {
unpolledCaches := copyCaches(t.UnpolledCaches())
allCaches := copyCaches(*t.allCaches) // not necessary to lock `allCaches`, as the single-writer is the only thing that accesses it.
- for cache, _ := range unpolledCaches {
+ for cache := range unpolledCaches {
if _, ok := newCaches[cache]; !ok {
delete(unpolledCaches, cache)
}
}
- for cache, _ := range allCaches {
+ for cache := range allCaches {
if _, ok := newCaches[cache]; !ok {
delete(allCaches, cache)
}
}
- for cache, _ := range newCaches {
+ for cache := range newCaches {
if _, ok := allCaches[cache]; !ok {
unpolledCaches[cache] = struct{}{}
allCaches[cache] = struct{}{}
@@ -77,7 +77,7 @@ func (t *UnpolledCachesThreadsafe) Any() bool {
// copyCaches performs a deep copy of the given map.
func copyCaches(a map[enum.CacheName]struct{}) map[enum.CacheName]struct{} {
b := map[enum.CacheName]struct{}{}
- for k, _ := range a {
+ for k := range a {
b[k] = struct{}{}
}
return b
@@ -93,7 +93,7 @@ func (t *UnpolledCachesThreadsafe) SetPolled(results []cache.Result, lastStatsTh
return
}
lastStats := lastStatsThreadsafe.Get()
- for cache, _ := range unpolledCaches {
+ for cache := range unpolledCaches {
innerLoop:
for _, result := range results {
if result.ID != cache {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b1bd9520/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go b/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go
index 33601bd..4793c77 100644
--- a/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go
+++ b/traffic_monitor/experimental/traffic_monitor/trafficopsdata/trafficopsdata.go
@@ -157,7 +157,7 @@ func getDeliveryServiceServers(crc CRConfig) (map[enum.DeliveryServiceName][]enu
serverDses := map[enum.CacheName][]enum.DeliveryServiceName{}
for serverName, serverData := range crc.ContentServers {
- for deliveryServiceName, _ := range serverData.DeliveryServices {
+ for deliveryServiceName := range serverData.DeliveryServices {
dsServers[deliveryServiceName] = append(dsServers[deliveryServiceName], serverName)
serverDses[serverName] = append(serverDses[serverName], deliveryServiceName)
}