rawlinp commented on code in PR #7068:
URL: https://github.com/apache/trafficcontrol/pull/7068#discussion_r967257497
##########
traffic_ops/traffic_ops_golang/monitoring/monitoring.go:
##########
@@ -36,11 +36,11 @@ import (
"github.com/lib/pq"
)
-const CacheMonitorConfigFile = "rascal.properties"
+const CacheMonitorConfigFile = "tm.properties"
-const MonitorType = "RASCAL"
+const MonitorType = "TRAFFIC_MONITOR"
Review Comment:
Wherever these constants are being used, the code should likely be checking
for either `RASCAL` or `TRAFFIC_MONITOR` for backwards-compatibility. Then at
some point in the future, the code can be changed to just look for
`TRAFFIC_MONITOR`. The same is generally true for other variables that
reference particular legacy names.
##########
traffic_ops/traffic_ops_golang/cdn/capacity.go:
##########
@@ -208,7 +208,7 @@ JOIN server as s ON s.profile = pr.id
JOIN cdn as c ON c.id = s.cdn_id
JOIN type as t ON s.type = t.id
WHERE t.name LIKE 'EDGE%'
-AND pa.config_file = 'rascal-config.txt'
+AND pa.config_file = 'tm-config.txt'
Review Comment:
We can't just change what TO is querying for here when all the existing
parameters likely use the `config_file` of `rascal-config.txt`. In general, we
can either include a DB migration which will change all parameters from
`rascal-config.txt` to `tm-config.txt`, make this code look for _either_ name,
and or both of those.
Also, it would be good to use the constant `MonitorConfigFile` from the
`monitoring` package here.
##########
traffic_ops/traffic_ops_golang/deliveryservice/capacity.go:
##########
@@ -249,7 +249,7 @@ JOIN server as s ON s.profile = pr.id
JOIN cdn as c ON c.id = s.cdn_id
JOIN type as t ON s.type = t.id
WHERE t.name LIKE 'EDGE%'
-AND pa.config_file = 'rascal-config.txt'
+AND pa.config_file = 'tm-config.txt'
Review Comment:
We can't just change what TO is querying for here when all the existing
parameters likely use the `config_file` of `rascal-config.txt`. In general, we
can either include a DB migration which will change all parameters from
`rascal-config.txt` to `tm-config.txt`, make this code look for _either_ name,
and or both of those.
Also, it would be good to use the constant `MonitorConfigFile` from the
`monitoring` package here.
##########
docs/source/admin/traffic_router.rst:
##########
@@ -195,7 +195,7 @@ Much of a Traffic Router's configuration can be obtained
through the :term:`Para
+-----------------------------------------+------------------------------+---------------------------------------------------------------------------------------------------------------------------------------+
| location | geolocation.properties
| Location to find the log4j2.xml file for Traffic Router.
|
+-----------------------------------------+------------------------------+---------------------------------------------------------------------------------------------------------------------------------------+
- | CDN_name | rascal-config.txt
| The human readable name of the CDN for this :term:`Profile`.
|
+ | CDN_name | tm-config.txt
| The human readable name of the CDN for this :term:`Profile`.
|
Review Comment:
I'm pretty certain that it doesn't actually matter if this parameter exists
in the TR profile.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
