Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 5cc55aa7d -> a06dd8528
renamed the getServers to be namespaced Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/663ac0f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/663ac0f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/663ac0f9 Branch: refs/heads/master Commit: 663ac0f9b78247720c9f1ffbabe611e84318bb2b Parents: 5cc55aa Author: Dewayne Richardson <dewr...@apache.org> Authored: Mon Aug 14 14:45:33 2017 -0600 Committer: Robert Butts <robert.o.bu...@gmail.com> Committed: Tue Aug 15 08:51:03 2017 -0600 ---------------------------------------------------------------------- traffic_ops/traffic_ops_golang/monitoring.go | 7 ++++--- .../traffic_ops_golang/monitoring_test.go | 22 ++++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/663ac0f9/traffic_ops/traffic_ops_golang/monitoring.go ---------------------------------------------------------------------- diff --git a/traffic_ops/traffic_ops_golang/monitoring.go b/traffic_ops/traffic_ops_golang/monitoring.go index 62c5f47..e31b423 100644 --- a/traffic_ops/traffic_ops_golang/monitoring.go +++ b/traffic_ops/traffic_ops_golang/monitoring.go @@ -23,10 +23,11 @@ import ( "database/sql" "encoding/json" "fmt" - "github.com/lib/pq" "net/http" "strings" + "github.com/lib/pq" + "github.com/apache/incubator-trafficcontrol/traffic_monitor_golang/common/log" ) @@ -131,7 +132,7 @@ func monitoringHandler(db *sql.DB) RegexHandlerFunc { } } -func getServers(db *sql.DB, cdn string) ([]Monitor, []Cache, []Router, error) { +func getMonitoringServers(db *sql.DB, cdn string) ([]Monitor, []Cache, []Router, error) { query := `SELECT me.host_name as hostName, CONCAT(me.host_name, '.', me.domain_name) as fqdn, @@ -381,7 +382,7 @@ WHERE pr.config_file = '%s' } func getMonitoringJson(cdnName string, db *sql.DB) (*MonitoringResponse, error) { - monitors, caches, routers, err := getServers(db, cdnName) + monitors, caches, routers, err := getMonitoringServers(db, cdnName) if err != nil { return nil, fmt.Errorf("error getting servers: %v", err) } http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/663ac0f9/traffic_ops/traffic_ops_golang/monitoring_test.go ---------------------------------------------------------------------- diff --git a/traffic_ops/traffic_ops_golang/monitoring_test.go b/traffic_ops/traffic_ops_golang/monitoring_test.go index f6958e3..1fe20d1 100644 --- a/traffic_ops/traffic_ops_golang/monitoring_test.go +++ b/traffic_ops/traffic_ops_golang/monitoring_test.go @@ -28,7 +28,7 @@ import ( "gopkg.in/DATA-DOG/go-sqlmock.v1" ) -func TestGetServers(t *testing.T) { +func TestGetMonitoringServers(t *testing.T) { db, mock, err := sqlmock.New() if err != nil { t.Fatalf("an error '%s' was not expected when opening a stub database connection", err) @@ -78,33 +78,33 @@ func TestGetServers(t *testing.T) { mock.ExpectQuery("SELECT").WithArgs(cdn).WillReturnRows(rows) - monitors, caches, routers, err := getServers(db, cdn) + monitors, caches, routers, err := getMonitoringServers(db, cdn) if err != nil { - t.Errorf("getServers expected: nil error, actual: %v", err) + t.Errorf("getMonitoringServers expected: nil error, actual: %v", err) } if len(monitors) != 1 { - t.Errorf("getServers expected: len(monitors) == 1, actual: %v", len(monitors)) + t.Errorf("getMonitoringServers expected: len(monitors) == 1, actual: %v", len(monitors)) } sqlMonitor := monitors[0] if sqlMonitor != monitor { - t.Errorf("getServers expected: monitor == %+v, actual: %+v", monitor, sqlMonitor) + t.Errorf("getMonitoringServers expected: monitor == %+v, actual: %+v", monitor, sqlMonitor) } if len(caches) != 1 { - t.Errorf("getServers expected: len(caches) == 1, actual: %v", len(caches)) + t.Errorf("getMonitoringServers expected: len(caches) == 1, actual: %v", len(caches)) } sqlCache := caches[0] if sqlCache != cache { - t.Errorf("getServers expected: cache == %+v, actual: %+v", cache, sqlCache) + t.Errorf("getMonitoringServers expected: cache == %+v, actual: %+v", cache, sqlCache) } if len(routers) != 1 { - t.Errorf("getServers expected: len(routers) == 1, actual: %v", len(routers)) + t.Errorf("getMonitoringServers expected: len(routers) == 1, actual: %v", len(routers)) } sqlRouter := routers[0] if sqlRouter != router { - t.Errorf("getServers expected: router == %+v, actual: %+v", router, sqlRouter) + t.Errorf("getMonitoringServers expected: router == %+v, actual: %+v", router, sqlRouter) } if err := mock.ExpectationsWereMet(); err != nil { @@ -144,7 +144,7 @@ func TestGetCachegroups(t *testing.T) { } sqlCachegroup := sqlCachegroups[0] if sqlCachegroup != cachegroup { - t.Errorf("getServers expected: cachegroup == %+v, actual: %+v", cachegroup, sqlCachegroup) + t.Errorf("getMonitoringServers expected: cachegroup == %+v, actual: %+v", cachegroup, sqlCachegroup) } if err := mock.ExpectationsWereMet(); err != nil { @@ -427,7 +427,7 @@ func TestGetMonitoringJson(t *testing.T) { { // - // getServers + // getMonitoringServers // monitor := Monitor{ BasicServer: BasicServer{Profile: "monitorProfile",
