From 6ddfdf453481b020be55d6f096cc240f1c252c88 Mon Sep 17 00:00:00 2001 From: Robert Butts Date: Thu, 9 Jan 2020 13:53:53 -0700 Subject: [PATCH] Fix atstccfg logging non-errors --- .../ort/atstccfg/cfgfile/cacheurldotconfig.go | 7 ++++--- .../ort/atstccfg/cfgfile/sslmulticertdotconfig.go | 12 +++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/traffic_ops/ort/atstccfg/cfgfile/cacheurldotconfig.go b/traffic_ops/ort/atstccfg/cfgfile/cacheurldotconfig.go index a0da83da52..db9603735c 100644 --- a/traffic_ops/ort/atstccfg/cfgfile/cacheurldotconfig.go +++ b/traffic_ops/ort/atstccfg/cfgfile/cacheurldotconfig.go @@ -23,7 +23,6 @@ import ( "errors" "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" "github.com/apache/trafficcontrol/lib/go-tc" "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/toreq" @@ -62,8 +61,6 @@ func GetConfigFileCDNCacheURL(cfg config.TCCfg, cdnNameOrID string, fileName str return "", errors.New("getting delivery service servers: " + err.Error()) } - log.Errorf("gcfccu dss: %v\n", len(dss)) - dssMap := map[int][]int{} // map[dsID]serverID for _, dss := range dss { if dss.Server == nil || dss.DeliveryService == nil { @@ -77,6 +74,10 @@ func GetConfigFileCDNCacheURL(cfg config.TCCfg, cdnNameOrID string, fileName str if ds.ID == nil { continue // TODO warn } + // ANY_MAP and STEERING DSes don't have origins, and thus can't be put into the cacheurl config. + if ds.Type != nil && (*ds.Type == tc.DSTypeAnyMap || *ds.Type == tc.DSTypeSteering) { + continue + } if len(dssMap[*ds.ID]) == 0 { continue } diff --git a/traffic_ops/ort/atstccfg/cfgfile/sslmulticertdotconfig.go b/traffic_ops/ort/atstccfg/cfgfile/sslmulticertdotconfig.go index 928a558ddd..e27205c083 100644 --- a/traffic_ops/ort/atstccfg/cfgfile/sslmulticertdotconfig.go +++ b/traffic_ops/ort/atstccfg/cfgfile/sslmulticertdotconfig.go @@ -23,6 +23,7 @@ import ( "errors" "github.com/apache/trafficcontrol/lib/go-atscfg" + "github.com/apache/trafficcontrol/lib/go-tc" "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/toreq" ) @@ -48,7 +49,16 @@ func GetConfigFileCDNSSLMultiCertDotConfig(cfg config.TCCfg, cdnNameOrID string) return "", errors.New("getting delivery services: " + err.Error()) } - cfgDSes := atscfg.DeliveryServicesToSSLMultiCertDSes(dses) + filteredDSes := []tc.DeliveryServiceNullable{} + for _, ds := range dses { + // ANY_MAP and STEERING DSes don't have origins, and thus can't be put into the ssl config. + if ds.Type != nil && (*ds.Type == tc.DSTypeAnyMap || *ds.Type == tc.DSTypeSteering) { + continue + } + filteredDSes = append(filteredDSes, ds) + } + + cfgDSes := atscfg.DeliveryServicesToSSLMultiCertDSes(filteredDSes) txt := atscfg.MakeSSLMultiCertDotConfig(cdnName, toToolName, toURL, cfgDSes) return txt, nil