You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2018/12/21 13:37:29 UTC
[GitHub] jranson closed pull request #3125: fix English language typos
jranson closed pull request #3125: fix English language typos
URL: https://github.com/apache/trafficcontrol/pull/3125
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/source/admin/quick_howto/anonymous_blocking.rst b/docs/source/admin/quick_howto/anonymous_blocking.rst
index e62d651db..241871465 100644
--- a/docs/source/admin/quick_howto/anonymous_blocking.rst
+++ b/docs/source/admin/quick_howto/anonymous_blocking.rst
@@ -63,7 +63,7 @@ Configure Anonymous Blocking
:scale: 100%
:align: center
-#. Enable Anonmyous Blocking for a Delivery Service
+#. Enable Anonymous Blocking for a Delivery Service
.. figure:: anonymous_blocking/02.png
:scale: 100%
diff --git a/docs/source/admin/quick_howto/ciab.rst b/docs/source/admin/quick_howto/ciab.rst
index 770e4ff5c..0e70fd570 100644
--- a/docs/source/admin/quick_howto/ciab.rst
+++ b/docs/source/admin/quick_howto/ciab.rst
@@ -173,7 +173,7 @@ The enroller runs within CDN in a Box using the ``-dir <dir>`` switch which prov
Mock Origin Service
-------------------
-The default "origin" service container provides a basic static file HTTP server as the central respository for content. Additional files can be added to the origin root content directory located at ``infrastructure/cdn-in-a-box/origin/content``. To request content directly from the origin directly and bypass the CDN:
+The default "origin" service container provides a basic static file HTTP server as the central repository for content. Additional files can be added to the origin root content directory located at ``infrastructure/cdn-in-a-box/origin/content``. To request content directly from the origin directly and bypass the CDN:
* Origin Service URL: http://origin.infra.ciab.test/index.html
* Docker Host: http://localhost:9200/index.html
diff --git a/docs/source/admin/quick_howto/federations.rst b/docs/source/admin/quick_howto/federations.rst
index 2e1191ef9..7c3b9d2d3 100644
--- a/docs/source/admin/quick_howto/federations.rst
+++ b/docs/source/admin/quick_howto/federations.rst
@@ -29,7 +29,7 @@ Configure Federations
:scale: 100%
:align: center
-#. As a user with administrative priveleges, create a Federation Mapping by going to 'Services' -> 'Delivery Services' -> 'Federations' under 'More' and then clicking 'Add Federation Mapping'
+#. As a user with administrative privileges, create a Federation Mapping by going to 'Services' -> 'Delivery Services' -> 'Federations' under 'More' and then clicking 'Add Federation Mapping'
#. Choose the Delivery Service to which the federation will be mapped and assign it to the Federation-role user; click Add.
diff --git a/docs/source/admin/traffic_ops/configuration.rst b/docs/source/admin/traffic_ops/configuration.rst
index da6e14b00..b1a62f17b 100644
--- a/docs/source/admin/traffic_ops/configuration.rst
+++ b/docs/source/admin/traffic_ops/configuration.rst
@@ -295,7 +295,7 @@ Content Purge is controlled by the following parameters in the profile of the ca
+----------------------+-------------------------+--------------------------------------------------+-----------------------------------------------------------------------------------------------------------------+
-Note that the TTL the adminstrator enters in the purge request should be longer than the TTL of the content to ensure the bad content will not be used. If the CDN is serving content of unknown, or unlimited TTL, the administrator should consider using `proxy-config-http-cache-guaranteed-min-lifetime <https://docs.trafficserver.apache.org/en/latest/admin-guide/files/records.config.en.html#proxy-config-http-cache-guaranteed-min-lifetime>`_ to limit the maximum time an object can be in the cache before it is considered stale, and set that to the same value as `maxRevalDurationDays` (Note that the former is in seconds and the latter is in days, so convert appropriately).
+Note that the TTL the administrator enters in the purge request should be longer than the TTL of the content to ensure the bad content will not be used. If the CDN is serving content of unknown, or unlimited TTL, the administrator should consider using `proxy-config-http-cache-guaranteed-min-lifetime <https://docs.trafficserver.apache.org/en/latest/admin-guide/files/records.config.en.html#proxy-config-http-cache-guaranteed-min-lifetime>`_ to limit the maximum time an object can be in the cache before it is considered stale, and set that to the same value as `maxRevalDurationDays` (Note that the former is in seconds and the latter is in days, so convert appropriately).
diff --git a/docs/source/admin/traffic_ops/using.rst b/docs/source/admin/traffic_ops/using.rst
index 6cb39af26..611573b5d 100644
--- a/docs/source/admin/traffic_ops/using.rst
+++ b/docs/source/admin/traffic_ops/using.rst
@@ -274,7 +274,7 @@ These are the types of servers that can be managed in Traffic Ops:
+---------------+---------------------------------------------+
| RASCAL | Rascal health polling & reporting |
+---------------+---------------------------------------------+
-| TOOLS_SERVER | Ops hosts for managment |
+| TOOLS_SERVER | Ops hosts for management |
+---------------+---------------------------------------------+
| RIAK | Riak keystore |
+---------------+---------------------------------------------+
@@ -1001,7 +1001,7 @@ Generate ISO is a tool for building custom ISOs for building caches on remote ho
The interface is *mostly* self-explanatory as it's got hints.
+-------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
-| Field | Explaination |
+| Field | Explanation |
+===============================+=================================================================================================================================+
|Choose a server from list: | This option gets all the server names currently in the Traffic Ops database and will autofill known values. |
+-------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
@@ -1223,4 +1223,4 @@ If a new Delivery Service is created and added to a CDN that has DNSSEC enabled,
Regeneration of expiring keys for a Delivery Service
----------------------------------------------------
-Traffic Ops has a process, controlled by cron, to check for expired or expiring keys and re-generate them. The process runs at 5 minute intervals to check and see if keys are expired or close to expiring (withing 10 minutes by default). If keys are expired for a Delivery Service, traffic ops will regenerate new keys and store them in Traffic Vault. This process is the same for the CDN TLD ZSK, however Traffic Ops will not re-generate the CDN TLD KSK systematically. The reason is that when a KSK is regenerated for the CDN TLD then a new DS Record will also be created. The new DS Record needs to be added to the parent zone before Traffic Router attempts to sign with the new KSK in order for DNSSEC to work correctly. Therefore, management of the KSK needs to be a manual process.
+Traffic Ops has a process, controlled by cron, to check for expired or expiring keys and re-generate them. The process runs at 5 minute intervals to check and see if keys are expired or close to expiring (within 10 minutes by default). If keys are expired for a Delivery Service, traffic ops will regenerate new keys and store them in Traffic Vault. This process is the same for the CDN TLD ZSK, however Traffic Ops will not re-generate the CDN TLD KSK systematically. The reason is that when a KSK is regenerated for the CDN TLD then a new DS Record will also be created. The new DS Record needs to be added to the parent zone before Traffic Router attempts to sign with the new KSK in order for DNSSEC to work correctly. Therefore, management of the KSK needs to be a manual process.
diff --git a/docs/source/admin/traffic_stats.rst b/docs/source/admin/traffic_stats.rst
index 1e3108425..b6788aa35 100644
--- a/docs/source/admin/traffic_stats.rst
+++ b/docs/source/admin/traffic_stats.rst
@@ -17,7 +17,7 @@
Traffic Stats Administration
****************************
-Traffic Stats consists of three seperate components: Traffic Stats, InfluxDB, and Grafana. See below for information on installing and configuring each component as well as configuring the integration between the three and Traffic Ops.
+Traffic Stats consists of three separate components: Traffic Stats, InfluxDB, and Grafana. See below for information on installing and configuring each component as well as configuring the integration between the three and Traffic Ops.
Installation
========================
diff --git a/docs/source/development/building.rst b/docs/source/development/building.rst
index e7dd95cbd..d2362fca1 100644
--- a/docs/source/development/building.rst
+++ b/docs/source/development/building.rst
@@ -51,7 +51,7 @@ Usage
Options
--q Quiet mode. Supresses output.
+-q Quiet mode. Suppresses output.
-v Verbose mode. Lists all build output.
-l List available projects.
diff --git a/docs/source/development/traffic_router.rst b/docs/source/development/traffic_router.rst
index 09f722026..061e905b0 100644
--- a/docs/source/development/traffic_router.rst
+++ b/docs/source/development/traffic_router.rst
@@ -20,7 +20,7 @@ Introduction
Traffic Router is a Java Tomcat application that routes clients to the closest available cache on the CDN using both HTTP and DNS. Cache availability is determined by Traffic Monitor; consequently Traffic Router polls Traffic Monitor for its configuration and cache health state information, and uses this data to make routing decisions. HTTP routing is performed by localizing the client based on the request's source IP address (IPv4 or IPv6), and issues an HTTP 302 redirect to the nearest cache. HTTP routing utilizes consistent hashing on request URLs to optimize cache performance and request distribution. DNS routing is performed by localizing clients, resolvers in most cases, requesting ``A`` and ``AAAA`` records for a configurable name such as ``foo.deliveryservice.somecdn.net``. Traffic Router is comprised of seven separate Maven modules:
* shared - A reusable utility JAR for defining Delivery Service Certificates
-* configuration - A resuable JAR defining the ConfigurationListener interface
+* configuration - A reusable JAR defining the ConfigurationListener interface
* connector - A JAR that overrides Tomcat's standard Http11Protocol Connector class and allows Traffic Router to delay opening listen sockets until it is in a state suitable for routing traffic
* geolocation - Submodule for defining geolocation services
* neustar - A Jar that provides a bean "neustarGeolocationService" that implements the GeolocationService interface defined in the geolocation maven submodule, which can optionally be added to the build of Traffic Router
@@ -108,7 +108,7 @@ To install the Traffic Router Developer environment:
f. Ensure ``traffic_router_api``, ``traffic_router_connector``, and ``traffic_router_core`` are checked; Finish (this step can take several minutes to complete)
g. Ensure ``traffic_router_api``, ``traffic_router_connector``, and ``traffic_router_core`` have been opened by Eclipse after importing
-7. From the terminal or your IDE, run ``mvn clean verify`` from the ``traffic_router`` directory. This will run a series of integration tests and will temporarily start and embeded version of Traffic Router and a 'fake' simulated instance of Traffic Monitor.
+7. From the terminal or your IDE, run ``mvn clean verify`` from the ``traffic_router`` directory. This will run a series of integration tests and will temporarily start and embedded version of Traffic Router and a 'fake' simulated instance of Traffic Monitor.
8. Start the embedded Tomcat instance for Core from within your IDE by following these steps:
@@ -139,7 +139,7 @@ Test Cases
RPM Packaging
=============
-Running ``mvn package`` on a Linux based distribution will trigger the build process to create the Traffic Router rpm and the Traffic Router .war file, but will not run the integration tests, so it is a good way to update those artifacts quickly during development. But the prefered way to build the Traffic Router RPMs is to navigate to the root of the Traffic Control source tree and run:
+Running ``mvn package`` on a Linux based distribution will trigger the build process to create the Traffic Router rpm and the Traffic Router .war file, but will not run the integration tests, so it is a good way to update those artifacts quickly during development. But the preferred way to build the Traffic Router RPMs is to navigate to the root of the Traffic Control source tree and run:
./pkg -v traffic_router_build
diff --git a/experimental/traffic_router_golang/crconfigdsservers/crconfigdsservers.go b/experimental/traffic_router_golang/crconfigdsservers/crconfigdsservers.go
index 3de5648b2..5e1f820f0 100644
--- a/experimental/traffic_router_golang/crconfigdsservers/crconfigdsservers.go
+++ b/experimental/traffic_router_golang/crconfigdsservers/crconfigdsservers.go
@@ -25,7 +25,7 @@ type DSServers map[tc.DeliveryServiceName]DSServer
type DSServer struct {
// TODO handle Steering
Name string
- DSFQDNs []string // TOOD determine if neccessary, how to index
+ DSFQDNs []string // TODO determine if necessary, how to index
}
type DSServer struct {
diff --git a/grove/integration_test/compare_gets.go b/grove/integration_test/compare_gets.go
index 0cf7ac6d2..f6fff0838 100644
--- a/grove/integration_test/compare_gets.go
+++ b/grove/integration_test/compare_gets.go
@@ -158,7 +158,7 @@ func main() {
originURL := flag.String("org", "http://localhost", "The origin URL (default: \"http://localhost\")")
cacheURL := flag.String("cache", "http://localhost:8080", "The cache URL (default: \"http://localhost:8080\")")
path := flag.String("path", "", "The path to GET")
- orgHdrs := flag.String("ohdrs", "", "Comma seperated list of headers to add to origin request")
+ orgHdrs := flag.String("ohdrs", "", "Comma separated list of headers to add to origin request")
cacheHdrs := flag.String("chdrs", "", "Comma separated list of headers to add to cache request")
ignoreHdrs := flag.String("ignorehdrs", "Server,Date", "Comma separated list of headers to ignore in the compare")
ignoreMultiPartBoundary := flag.Bool("ignorempb", true, "Ignore multi part boundary in body comparison.")
diff --git a/grove/integration_test/setup-and-run.sh b/grove/integration_test/setup-and-run.sh
index c9132ba90..6a0e52034 100644
--- a/grove/integration_test/setup-and-run.sh
+++ b/grove/integration_test/setup-and-run.sh
@@ -25,7 +25,7 @@ for i in {1..1000} ; do dd if=/dev/urandom of=${i}k.bin bs=${i}k count=1 > /dev
httpd
cd /
-echo Setting up go enviroment...
+echo Setting up go environment...
export GOPATH=~/go
go get golang.org/x/text
go get golang.org/x/sys/unix
diff --git a/grove/plugin/ats_log.go b/grove/plugin/ats_log.go
index b40f7a40e..2797011a1 100644
--- a/grove/plugin/ats_log.go
+++ b/grove/plugin/ats_log.go
@@ -64,7 +64,7 @@ func atsLog(icfg interface{}, d AfterRespondData) {
}
// getParentStrings returns the phr and pqsn ATS log event strings (in that order).
-// This covers almost all occurences that we currently see from ATS.
+// This covers almost all occurrences that we currently see from ATS.
func getParentStrings(code int, hit bool, proxyStr string, toFQDN string) (string, string) {
// the most common case (hopefully), do this first
if hit {
diff --git a/infrastructure/cdn-in-a-box/ort/traffic_ops_ort/to_api.py b/infrastructure/cdn-in-a-box/ort/traffic_ops_ort/to_api.py
index 73b16c66e..4e9c7d8b7 100644
--- a/infrastructure/cdn-in-a-box/ort/traffic_ops_ort/to_api.py
+++ b/infrastructure/cdn-in-a-box/ort/traffic_ops_ort/to_api.py
@@ -63,7 +63,7 @@ def __init__(self, raw:dict):
Constructs a server object out of some kind of raw API response
:param raw: some kind of ungodly huge JSON object from one API endpoint or
- another. Attempts will be made to resolve inconsistent naming accross
+ another. Attempts will be made to resolve inconsistent naming across
endpoints.
:raises ValueError: when the passed object doesn't have all required fields
"""
@@ -153,7 +153,7 @@ def getTOJSONResponse(uri:str) -> dict:
:returns: The decoded JSON response as an object
- .. note:: If the API response containes a 'response' object, this function will
+ .. note:: If the API response contains a 'response' object, this function will
only return that object. Also, if the API response contains an 'alerts' object,
they will be logged appropriately
@@ -181,7 +181,7 @@ def getTOJSONResponse(uri:str) -> dict:
if "alerts" in resp:
for alert in resp["alerts"]:
if "level" in alert:
- msg = alert["text"] if "text" in alert else "Unkown"
+ msg = alert["text"] if "text" in alert else "Unknown"
API_LOGGERS[alert["level"]](msg)
elif "text" in alert:
logging.warning("Traffic Ops API alert: %s", alert["text"])
@@ -201,7 +201,7 @@ def getUpdateStatus(host:str) -> dict:
:param host: The (short) hostname of the server to query
:raises ValueError: if ``host`` is not a :const:`str`
- :raises PermissionError: if a new cookie is required, but fails to be aquired
+ :raises PermissionError: if a new cookie is required, but fails to be acquired
:returns: An object representing the API's response
"""
global CACHED_UPDATE_STATUS
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/to-access.sh b/infrastructure/cdn-in-a-box/traffic_ops/to-access.sh
index 5ce8ccbc9..c7377792e 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/to-access.sh
+++ b/infrastructure/cdn-in-a-box/traffic_ops/to-access.sh
@@ -131,7 +131,7 @@ to-delete() {
curl $CURLAUTH $CURLOPTS --cookie "$COOKIEJAR" -X DELETE "$TO_URL/$1"
}
-# Constructs a server's JSON definiton and places it into the enroller's structure for loading
+# Constructs a server's JSON definition and places it into the enroller's structure for loading
# args:
# serverType - the type of the server to be created; one of "edge", "mid", "tm"
to-enroll() {
diff --git a/misc/kickstart_create_network_line.py b/misc/kickstart_create_network_line.py
index ee1378e35..1bf2a1d51 100755
--- a/misc/kickstart_create_network_line.py
+++ b/misc/kickstart_create_network_line.py
@@ -80,7 +80,7 @@ def read_config(config_file):
def find_usable_net_devs(location):
''' Search through iface_dir looking for /speed files.
Build a dict keyed on speed (in otherwords the speed is the key with a list of
- interfaces as teh value). '''
+ interfaces as the value). '''
# We "pre-seed" the dictionary with the standard interface names at a
# speed of 5 so that if there's nothing else we set that up. This
# makes it easier to reconfigure later.
diff --git a/pkg b/pkg
index 0c3cf0422..fc5f3e511 100755
--- a/pkg
+++ b/pkg
@@ -89,7 +89,7 @@ while getopts :lvq? opt; do
\?)
PROJECTS=`$SELF -l | sed "s/^/ - /"`
echo "Usage: $SELF [options] [projects]"
- echo " -q Quiet mode. Supresses output."
+ echo " -q Quiet mode. Suppresses output."
echo " -v Verbose mode. Lists all build output."
echo " -l List available projects."
echo
diff --git a/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/ResponseFuture.java b/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/ResponseFuture.java
index 2e96a2151..ca946f3f9 100644
--- a/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/ResponseFuture.java
+++ b/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/ResponseFuture.java
@@ -85,7 +85,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
}
protected abstract ResponseFuture<T> autoBuild();
public abstract ResponseFuture.Builder<T> setHandleException(BiConsumer<ResponseFuture<T>, Throwable> function);
- public abstract ResponseFuture.Builder<T> setResponseType(Class<T> respone);
+ public abstract ResponseFuture.Builder<T> setResponseType(Class<T> response);
public abstract ResponseFuture.Builder<T> setMethod(ResponseFuture.Method method);
public abstract ResponseFuture.Builder<T> setUri(URI uri);
public ResponseFuture.Builder<T> setUri(String uri){
@@ -118,7 +118,7 @@ public void accept(HttpResponse res, Throwable u) {
if(resp.getAlerts() != null) {
for(Alert a: resp.getAlerts()) {
if("error".equals(a.getLevel())) {
- _handleException(new OperationException("Recieved error from server: "+ a.getText()));
+ _handleException(new OperationException("Received error from server: "+ a.getText()));
return;
}
}
diff --git a/traffic_monitor/dsdata/stat.go b/traffic_monitor/dsdata/stat.go
index 32ad5e290..d31dad259 100644
--- a/traffic_monitor/dsdata/stat.go
+++ b/traffic_monitor/dsdata/stat.go
@@ -341,7 +341,7 @@ func NewStats(size int) *Stats {
return &Stats{DeliveryService: make(map[tc.DeliveryServiceName]*Stat, size)}
}
-// LastStats includes the previously recieved stats for DeliveryServices and Caches, the stat itself, when it was received, and the stat value per second.
+// LastStats includes the previously received stats for DeliveryServices and Caches, the stat itself, when it was received, and the stat value per second.
type LastStats struct {
DeliveryServices map[tc.DeliveryServiceName]*LastDSStat
Caches map[tc.CacheName]*LastStatsData
diff --git a/traffic_monitor/manager/stat.go b/traffic_monitor/manager/stat.go
index 8c9d7063c..d631d784f 100644
--- a/traffic_monitor/manager/stat.go
+++ b/traffic_monitor/manager/stat.go
@@ -147,9 +147,9 @@ func StartStatHistoryManager(
// There are 2 timers: the Buffer, and the Flush.
// The Buffer says "never process until this much time has elapsed"
- // The Flush says "if we're continuously getting new stats, with no break, and this much time has elasped, go ahead and process anyway to prevent starvation"
+ // The Flush says "if we're continuously getting new stats, with no break, and this much time has elapsed, go ahead and process anyway to prevent starvation"
//
- // So, we continuously read from the stat channel, until Buffer has elasped. Even if the channel is empty, wait and keep trying to read.
+ // So, we continuously read from the stat channel, until Buffer has elapsed. Even if the channel is empty, wait and keep trying to read.
// Then, we move to State 2: continuously read from the stat channel, while there are things to read. If at any point there's nothing more to read, then process. Otherwise, if there are always thing to read, then after Flush time has elapsed, then go ahead and read anyway, and go to State 1.
//
// Note that either the Buffer or Flush may be configured to be 0.
diff --git a/traffic_monitor/tmcheck/dsstats.go b/traffic_monitor/tmcheck/dsstats.go
index d9479db9b..b4a1508ee 100644
--- a/traffic_monitor/tmcheck/dsstats.go
+++ b/traffic_monitor/tmcheck/dsstats.go
@@ -88,7 +88,7 @@ func ValidateDSStatsData(dsStats *dsdata.StatsOld, crconfig *tc.CRConfig) error
return nil
}
-// DSStatsValidator is designed to be run as a goroutine, and does not return. It continously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll.
+// DSStatsValidator is designed to be run as a goroutine, and does not return. It continuously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll.
func DSStatsValidator(
tmURI string,
toClient *to.Session,
@@ -101,7 +101,7 @@ func DSStatsValidator(
Validator(tmURI, toClient, interval, grace, onErr, onResumeSuccess, onCheck, ValidateDSStats)
}
-// AllMonitorsDSStatsValidator is designed to be run as a goroutine, and does not return. It continously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll. Note the error passed to `onErr` may be a general validation error not associated with any monitor, in which case the passed `tc.TrafficMonitorName` will be empty.
+// AllMonitorsDSStatsValidator is designed to be run as a goroutine, and does not return. It continuously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll. Note the error passed to `onErr` may be a general validation error not associated with any monitor, in which case the passed `tc.TrafficMonitorName` will be empty.
func AllMonitorsDSStatsValidator(
toClient *to.Session,
interval time.Duration,
diff --git a/traffic_monitor/tmcheck/offlinestates.go b/traffic_monitor/tmcheck/offlinestates.go
index 599e3d597..6ee1eabce 100644
--- a/traffic_monitor/tmcheck/offlinestates.go
+++ b/traffic_monitor/tmcheck/offlinestates.go
@@ -85,7 +85,7 @@ func ValidateCRStates(crstates *tc.CRStates, crconfig *tc.CRConfig) error {
return nil
}
-// CRStatesOfflineValidator is designed to be run as a goroutine, and does not return. It continously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll.
+// CRStatesOfflineValidator is designed to be run as a goroutine, and does not return. It continuously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll.
func CRStatesOfflineValidator(
tmURI string,
toClient *to.Session,
@@ -98,7 +98,7 @@ func CRStatesOfflineValidator(
Validator(tmURI, toClient, interval, grace, onErr, onResumeSuccess, onCheck, ValidateOfflineStates)
}
-// AllMonitorsCRStatesOfflineValidator is designed to be run as a goroutine, and does not return. It continously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll. Note the error passed to `onErr` may be a general validation error not associated with any monitor, in which case the passed `tc.TrafficMonitorName` will be empty.
+// AllMonitorsCRStatesOfflineValidator is designed to be run as a goroutine, and does not return. It continuously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll. Note the error passed to `onErr` may be a general validation error not associated with any monitor, in which case the passed `tc.TrafficMonitorName` will be empty.
func AllMonitorsCRStatesOfflineValidator(
toClient *to.Session,
interval time.Duration,
diff --git a/traffic_monitor/tmcheck/queryinterval.go b/traffic_monitor/tmcheck/queryinterval.go
index bdcf678e9..cc3744a4b 100644
--- a/traffic_monitor/tmcheck/queryinterval.go
+++ b/traffic_monitor/tmcheck/queryinterval.go
@@ -43,7 +43,7 @@ func ValidateQueryInterval(tmURI string, toClient *to.Session) error {
return nil
}
-// QueryIntervalValidator is designed to be run as a goroutine, and does not return. It continously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll.
+// QueryIntervalValidator is designed to be run as a goroutine, and does not return. It continuously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll.
func QueryIntervalValidator(
tmURI string,
toClient *to.Session,
@@ -56,7 +56,7 @@ func QueryIntervalValidator(
Validator(tmURI, toClient, interval, grace, onErr, onResumeSuccess, onCheck, ValidateQueryInterval)
}
-// AllMonitorsQueryIntervalValidator is designed to be run as a goroutine, and does not return. It continously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll. Note the error passed to `onErr` may be a general validation error not associated with any monitor, in which case the passed `tc.TrafficMonitorName` will be empty.
+// AllMonitorsQueryIntervalValidator is designed to be run as a goroutine, and does not return. It continuously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll. Note the error passed to `onErr` may be a general validation error not associated with any monitor, in which case the passed `tc.TrafficMonitorName` will be empty.
func AllMonitorsQueryIntervalValidator(
toClient *to.Session,
interval time.Duration,
diff --git a/traffic_monitor/tmcheck/tmcheck.go b/traffic_monitor/tmcheck/tmcheck.go
index 4561f9320..4ec621d66 100644
--- a/traffic_monitor/tmcheck/tmcheck.go
+++ b/traffic_monitor/tmcheck/tmcheck.go
@@ -154,7 +154,7 @@ type AllValidatorFunc func(
onCheck func(tc.TrafficMonitorName, error),
)
-// CRStatesOfflineValidator is designed to be run as a goroutine, and does not return. It continously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll.
+// CRStatesOfflineValidator is designed to be run as a goroutine, and does not return. It continuously validates every `interval`, and calls `onErr` on failure, `onResumeSuccess` when a failure ceases, and `onCheck` on every poll.
func Validator(
tmURI string,
toClient *to.Session,
diff --git a/traffic_ops/app/bin/checks/ToDSCPCheck.pl b/traffic_ops/app/bin/checks/ToDSCPCheck.pl
index a9f6a25f1..b1f9f3a90 100755
--- a/traffic_ops/app/bin/checks/ToDSCPCheck.pl
+++ b/traffic_ops/app/bin/checks/ToDSCPCheck.pl
@@ -381,7 +381,7 @@ ()
print " cms_interface: required\n";
print " Interface used to communicate with edges.\n";
print " name: optional\n";
- print " The long name of this check. used in conjuction with syslog_facility.\n";
+ print " The long name of this check. used in conjunction with syslog_facility.\n";
print " syslog_facility: optional\n";
print " The syslog facility to send messages. Requires the \"name\" option to\n";
print " be set.\n";
diff --git a/traffic_ops/app/bin/checks/ToFQDNCheck.pl b/traffic_ops/app/bin/checks/ToFQDNCheck.pl
index 9c1106a89..cc03a8caf 100644
--- a/traffic_ops/app/bin/checks/ToFQDNCheck.pl
+++ b/traffic_ops/app/bin/checks/ToFQDNCheck.pl
@@ -276,7 +276,7 @@ sub help {
print " check_name: required\n";
print " The name of this check.\n";
print " name: optional\n";
- print " The long name of this check. used in conjuction with syslog_facility.\n";
+ print " The long name of this check. used in conjunction with syslog_facility.\n";
print " syslog_facility: optional\n";
print " The syslog facility to send messages. Requires the \"name\" option to\n";
print " be set.\n";
diff --git a/traffic_ops/app/bin/checks/ToORTCheck.pl b/traffic_ops/app/bin/checks/ToORTCheck.pl
index deb71bb61..a871c464f 100755
--- a/traffic_ops/app/bin/checks/ToORTCheck.pl
+++ b/traffic_ops/app/bin/checks/ToORTCheck.pl
@@ -213,7 +213,7 @@ ()
print " check_name: required\n";
print " The name of this check.\n";
print " name: optional\n";
- print " The long name of this check. used in conjuction with syslog_facility.\n";
+ print " The long name of this check. used in conjunction with syslog_facility.\n";
print " syslog_facility: optional\n";
print " The syslog facility to send messages. Requires the \"name\" option to\n";
print " be set.\n";
diff --git a/traffic_ops/app/bin/checks/ToPingCheck.pl b/traffic_ops/app/bin/checks/ToPingCheck.pl
index b03a19bbd..ef3ac76eb 100755
--- a/traffic_ops/app/bin/checks/ToPingCheck.pl
+++ b/traffic_ops/app/bin/checks/ToPingCheck.pl
@@ -221,7 +221,7 @@ ()
print " \"select:\" \"ip6Address\"\n";
print " \"select:\" \"iloIpAddress\"\n";
print " name: optional\n";
- print " The long name of this check. used in conjuction with syslog_facility.\n";
+ print " The long name of this check. used in conjunction with syslog_facility.\n";
print " syslog_facility: optional\n";
print " The syslog facility to send messages. Requires the \"name\" option to\n";
print " be set.\n";
diff --git a/traffic_ops/app/bin/checks/ToRTRCheck.pl b/traffic_ops/app/bin/checks/ToRTRCheck.pl
index 6e43ba12a..b27ed9898 100755
--- a/traffic_ops/app/bin/checks/ToRTRCheck.pl
+++ b/traffic_ops/app/bin/checks/ToRTRCheck.pl
@@ -454,7 +454,7 @@ ()
print " check_name: required\n";
print " The name of this check.\n";
print " name: optional\n";
- print " The long name of this check. used in conjuction with syslog_facility.\n";
+ print " The long name of this check. used in conjunction with syslog_facility.\n";
print " syslog_facility: optional\n";
print " The syslog facility to send messages. Requires the \"name\" option to\n";
print " be set.\n";
diff --git a/traffic_ops/app/db/tools/tenant-init b/traffic_ops/app/db/tools/tenant-init
index 9a7d6a1cd..55ea5851d 100755
--- a/traffic_ops/app/db/tools/tenant-init
+++ b/traffic_ops/app/db/tools/tenant-init
@@ -45,7 +45,7 @@ my $usage = "\n"
. " (If no such user exists the tenant practically cannot be used).\n"
. " It additionally can provide a list of all root tenants.\n\n"
. "Operations: \n"
- . "assign-user - Assign a user to tenant acording to below options.\n"
+ . "assign-user - Assign a user to tenant according to below options.\n"
. "list-root-tenants - list all root tenants.\n\n"
. "Options: \n"
. "env - The environment (development|test|production|integration) to execute the operation on.\n"
diff --git a/traffic_ops/app/lib/API/Cachegroup.pm b/traffic_ops/app/lib/API/Cachegroup.pm
index bd55b6a63..50de30ab5 100644
--- a/traffic_ops/app/lib/API/Cachegroup.pm
+++ b/traffic_ops/app/lib/API/Cachegroup.pm
@@ -411,7 +411,7 @@ sub postupdatequeue {
my $self = shift;
my $params = $self->req->json;
if ( !&is_oper($self) ) {
- return $self->forbidden("Forbidden. Insufficent privileges.");
+ return $self->forbidden("Forbidden. Insufficient privileges.");
}
my $name;
diff --git a/traffic_ops/app/lib/API/Capability.pm b/traffic_ops/app/lib/API/Capability.pm
index 53d9b4730..204bdc2e2 100644
--- a/traffic_ops/app/lib/API/Capability.pm
+++ b/traffic_ops/app/lib/API/Capability.pm
@@ -172,7 +172,7 @@ sub delete {
my $rs_data = $self->db->resultset("ApiCapability")->find( { 'me.capability' => $name } );
if ( defined($rs_data) ) {
my $reference_id = $rs_data->id;
- return $self->alert("Capability \'$name\' is refered by an api_capability mapping: $reference_id. Deletion failed.");
+ return $self->alert("Capability \'$name\' is referred by an api_capability mapping: $reference_id. Deletion failed.");
}
my $rs = $capability->delete();
diff --git a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
index f35225b03..29dfd959d 100755
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -1806,7 +1806,7 @@ sub regex_revalidate_dot_config {
my $job_cdn_id = $row->job_deliveryservice->cdn_id;
if ( $cdn_obj->id == $job_cdn_id ) {
- # if there are multipe with same re, pick the longes lasting.
+ # if there are multiple with same re, pick the longes lasting.
if ( !defined( $regex_time{ $row->asset_url } )
|| ( defined( $regex_time{ $row->asset_url } ) && $purge_end > $regex_time{ $row->asset_url } ) )
{
@@ -1833,7 +1833,7 @@ sub set_dscp_dot_config {
$dscp_decimal = $1;
}
else {
- $text = "An error occured generating the DSCP header rewrite file.";
+ $text = "An error occurred generating the DSCP header rewrite file.";
}
$text .= "cond %{REMAP_PSEUDO_HOOK}\n" . "set-conn-dscp " . $dscp_decimal . " [L]\n";
diff --git a/traffic_ops/app/lib/API/DeliveryServiceRegexes.pm b/traffic_ops/app/lib/API/DeliveryServiceRegexes.pm
index b0321e9e3..6c09ff9b2 100644
--- a/traffic_ops/app/lib/API/DeliveryServiceRegexes.pm
+++ b/traffic_ops/app/lib/API/DeliveryServiceRegexes.pm
@@ -59,7 +59,7 @@ sub all {
return $self->success( \@regexes );
}
else {
- return $self->forbidden("Forbidden. Insufficent privileges.");
+ return $self->forbidden("Forbidden. Insufficient privileges.");
}
}
diff --git a/traffic_ops/app/lib/API/DeliveryServiceServer.pm b/traffic_ops/app/lib/API/DeliveryServiceServer.pm
index bba2769c7..cac0f0974 100644
--- a/traffic_ops/app/lib/API/DeliveryServiceServer.pm
+++ b/traffic_ops/app/lib/API/DeliveryServiceServer.pm
@@ -100,7 +100,7 @@ sub assign_servers_to_ds {
my $tenant_utils = Utils::Tenant->new($self);
my $tenants_data = $tenant_utils->create_tenants_data_from_db();
if (!$tenant_utils->is_ds_resource_accessible($tenants_data, $ds->tenant_id)) {
- return $self->alert("Invalid delivery-service assignment. The delivery-service is not avaialble for your tenant.");
+ return $self->alert("Invalid delivery-service assignment. The delivery-service is not available for your tenant.");
}
if ( ref($servers) ne 'ARRAY' ) {
diff --git a/traffic_ops/app/lib/API/Tenant.pm b/traffic_ops/app/lib/API/Tenant.pm
index de099d0ab..d63fd08e0 100644
--- a/traffic_ops/app/lib/API/Tenant.pm
+++ b/traffic_ops/app/lib/API/Tenant.pm
@@ -129,7 +129,7 @@ sub update {
#parent replacement
if (!$tenant_utils->is_tenant_resource_accessible($tenants_data, $tenant->parent_id)) {
#Current owning tenant is not under user's tenancy
- return $self>alert("Invalid parent tenant change. The current tenant parent is not avaialble for you to edit");
+ return $self>alert("Invalid parent tenant change. The current tenant parent is not available for you to edit");
}
if (!defined($tenant_utils->get_tenant_by_id($tenants_data, $params->{parentId}))) {
return $self->alert("Parent tenant does not exists.");
@@ -138,21 +138,21 @@ sub update {
#Parent tenant to be set is not under user's tenancy
return $self->alert("Invalid parent tenant. This tenant is not available to you for parent assignment.");
}
- my $parent_depth = $tenant_utils->get_tenant_heirarchy_depth($tenants_data, $params->{parentId});
+ my $parent_depth = $tenant_utils->get_tenant_hierarchy_depth($tenants_data, $params->{parentId});
if (!defined($parent_depth))
{
return $self->alert("Failed to retrieve parent tenant depth.");
}
- my $tenant_height = $tenant_utils->get_tenant_heirarchy_height($tenants_data, $id);
+ my $tenant_height = $tenant_utils->get_tenant_hierarchy_height($tenants_data, $id);
if (!defined($tenant_height))
{
return $self->alert("Failed to retrieve tenant height.");
}
- if ($parent_depth+$tenant_height+1 > $tenant_utils->max_heirarchy_limit())
+ if ($parent_depth+$tenant_height+1 > $tenant_utils->max_hierarchy_limit())
{
- return $self->alert("Parent tenant is invalid: heirarchy limit reached.");
+ return $self->alert("Parent tenant is invalid: hierarchy limit reached.");
}
if ($params->{parentId} == $id){
@@ -234,16 +234,16 @@ sub create {
return $self->alert("Invalid parent tenant. This tenant is not available to you for parent assignment.");
}
- my $parent_depth = $tenant_utils->get_tenant_heirarchy_depth($tenants_data, $params->{parentId});
+ my $parent_depth = $tenant_utils->get_tenant_hierarchy_depth($tenants_data, $params->{parentId});
if (!defined($parent_depth))
{
return $self->alert("Failed to retrieve parent tenant depth.");
}
- if ($parent_depth+1 > $tenant_utils->max_heirarchy_limit()-1)
+ if ($parent_depth+1 > $tenant_utils->max_hierarchy_limit()-1)
{
- return $self->alert("Parent tenant is invalid: heirarchy limit reached.");
+ return $self->alert("Parent tenant is invalid: hierarchy limit reached.");
}
my $existing = $self->db->resultset('Tenant')->search( { name => $params->{name} } )->get_column('name')->single();
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Type.pm b/traffic_ops/app/lib/Fixtures/Integration/Type.pm
index 27e52fb9f..4e1a0e34d 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Type.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Type.pm
@@ -322,7 +322,7 @@ my %definition_for = (
using => {
name => 'TOOLS_SERVER',
use_in_table => 'server',
- description => 'Ops hosts for managment ',
+ description => 'Ops hosts for management ',
last_updated => '2015-12-10 15:43:45',
},
},
diff --git a/traffic_ops/app/lib/MojoPlugins/Daemonize.pm b/traffic_ops/app/lib/MojoPlugins/Daemonize.pm
index 503703159..35e88d2a6 100755
--- a/traffic_ops/app/lib/MojoPlugins/Daemonize.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Daemonize.pm
@@ -25,7 +25,7 @@ sub register {
$app->renderer->add_helper(
# Note: Calling fork_and_daemonize() returns twice: Once for the parent and the other for the daemon (=child).
# Caller should check return value:
- # <0 means an error occured
+ # <0 means an error occurred
# 0 means you are the daemon (=child)
# 1 means you are the parent (= original process)
fork_and_daemonize => sub {
diff --git a/traffic_ops/app/lib/TrafficOps.pm b/traffic_ops/app/lib/TrafficOps.pm
index 2f42e6b2a..0d04ad34d 100644
--- a/traffic_ops/app/lib/TrafficOps.pm
+++ b/traffic_ops/app/lib/TrafficOps.pm
@@ -239,7 +239,7 @@ sub setup_mojo_plugins {
my $c = $self->load_conf();
$config = $self->plugin( 'Config' => { default => $c } );
- # setting a default message if no user account is found in tm_user. this default can be overriden in cdn.conf
+ # setting a default message if no user account is found in tm_user. this default can be overridden in cdn.conf
$config->{'to'}{'no_account_found_msg'} //= "A Traffic Ops user account is required for access. Please contact your Traffic Ops user administrator.";
if ( !defined $ENV{MOJO_INACTIVITY_TIMEOUT} ) {
diff --git a/traffic_ops/app/lib/UI/ConfigFiles.pm b/traffic_ops/app/lib/UI/ConfigFiles.pm
index 90c4bd2b5..7cc7f3bb0 100644
--- a/traffic_ops/app/lib/UI/ConfigFiles.pm
+++ b/traffic_ops/app/lib/UI/ConfigFiles.pm
@@ -1470,7 +1470,7 @@ sub regex_revalidate_dot_config {
my $job_cdn_id = $row->job_deliveryservice->cdn_id;
if ( $server->cdn_id == $job_cdn_id ) {
- # if there are multipe with same re, pick the longes lasting.
+ # if there are multiple with same re, pick the longes lasting.
if ( !defined( $regex_time{ $row->asset_url } )
|| ( defined( $regex_time{ $row->asset_url } ) && $purge_end > $regex_time{ $row->asset_url } ) )
{
@@ -1576,7 +1576,7 @@ sub header_rewrite_dscp_dot_config {
$dscp_decimal = $1;
}
else {
- $text = "An error occured generating the DSCP header rewrite file.";
+ $text = "An error occurred generating the DSCP header rewrite file.";
}
$text .= "cond %{REMAP_PSEUDO_HOOK}\n" . "set-conn-dscp " . $dscp_decimal . " [L]\n";
diff --git a/traffic_ops/app/lib/UI/DeliveryService.pm b/traffic_ops/app/lib/UI/DeliveryService.pm
index 578538db8..95fcab74e 100644
--- a/traffic_ops/app/lib/UI/DeliveryService.pm
+++ b/traffic_ops/app/lib/UI/DeliveryService.pm
@@ -1326,7 +1326,7 @@ sub create_dnssec_keys {
my $json_data = encode_json($keys);
$response_container = $self->riak_put( "dnssec", $cdn_name, $json_data );
} else {
- my $err = "Could not create DNSSEC keys for $xml_id. Reponse was " . $get_keys->{_content};
+ my $err = "Could not create DNSSEC keys for $xml_id. Response was " . $get_keys->{_content};
$self->app->log->error($err);
return $err;
}
diff --git a/traffic_ops/app/lib/UI/PhysLocation.pm b/traffic_ops/app/lib/UI/PhysLocation.pm
index 258c1aab4..3297ead11 100644
--- a/traffic_ops/app/lib/UI/PhysLocation.pm
+++ b/traffic_ops/app/lib/UI/PhysLocation.pm
@@ -225,7 +225,7 @@ sub create {
my $email = $self->param('location.email'),
my $comments = $self->param('location.comments'),
my $region = $self->param('location.region'),
- my $data = $self->get_phsyical_location_names();
+ my $data = $self->get_physical_location_names();
my $names = $data->{'names'};
my $short_names = $data->{'short_names'};
@@ -320,7 +320,7 @@ sub create {
return $self->redirect_to( '/phys_location/' . $new_id . '/edit' );
}
-sub get_phsyical_location_names {
+sub get_physical_location_names {
my $self = shift;
my %data;
diff --git a/traffic_ops/app/lib/UI/UploadHandlerCsv.pm b/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
index d1e591445..d16af2bcb 100644
--- a/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
+++ b/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
@@ -230,7 +230,7 @@ sub checkNamedValues {
my $physLocationHashRef = shift;
my $processCSVErrors = '';
- # allow integers for backward compatability but if non-integer then validate as well
+ # allow integers for backward compatibility but if non-integer then validate as well
if ( !exists $cdnHashRef->{$enteredCdn} ) {
$processCSVErrors
.= $errorLineDelim
diff --git a/traffic_ops/app/lib/UI/User.pm b/traffic_ops/app/lib/UI/User.pm
index d3b30c345..0bb2b81a5 100644
--- a/traffic_ops/app/lib/UI/User.pm
+++ b/traffic_ops/app/lib/UI/User.pm
@@ -291,7 +291,7 @@ sub create_user {
{
full_name => $self->param('tm_user.full_name'),
username => $self->param('tm_user.username'),
- tenant_id => undef, #Tenancy is not dealt by the UI for now. settin to no tenant - minimal priviledge to the user
+ tenant_id => undef, #Tenancy is not dealt by the UI for now. settin to no tenant - minimal privilege to the user
public_ssh_key => $self->param('tm_user.public_ssh_key'),
phone_number => $self->param('tm_user.phone_number'),
email => $self->param('tm_user.email'),
diff --git a/traffic_ops/app/lib/Utils/Tenant.pm b/traffic_ops/app/lib/Utils/Tenant.pm
index 0d2a69dac..fe8ce59a7 100644
--- a/traffic_ops/app/lib/Utils/Tenant.pm
+++ b/traffic_ops/app/lib/Utils/Tenant.pm
@@ -225,7 +225,7 @@ sub is_tenant_resource_accessible {
my $tenants_data = shift;
my $resource_tenancy = shift;
- return $self->_is_resource_accessable( $tenants_data, $resource_tenancy);
+ return $self->_is_resource_accessible( $tenants_data, $resource_tenancy);
}
sub is_user_resource_accessible {
@@ -233,7 +233,7 @@ sub is_user_resource_accessible {
my $tenants_data = shift;
my $resource_tenancy = shift;
- return $self->_is_resource_accessable( $tenants_data, $resource_tenancy);
+ return $self->_is_resource_accessible( $tenants_data, $resource_tenancy);
}
sub is_ds_resource_accessible {
@@ -241,7 +241,7 @@ sub is_ds_resource_accessible {
my $tenants_data = shift;
my $resource_tenancy = shift;
- return $self->_is_resource_accessable( $tenants_data, $resource_tenancy);
+ return $self->_is_resource_accessible( $tenants_data, $resource_tenancy);
}
sub is_ds_resource_accessible_to_tenant {
@@ -250,7 +250,7 @@ sub is_ds_resource_accessible_to_tenant {
my $resource_tenancy = shift;
my $user_tenancy = shift;
- return $self->_is_resource_accessable_to_tenant( $tenants_data, $resource_tenancy, $user_tenancy);
+ return $self->_is_resource_accessible_to_tenant( $tenants_data, $resource_tenancy, $user_tenancy);
}
sub use_tenancy {
@@ -264,7 +264,7 @@ sub use_tenancy {
return 0;
}
-sub get_tenant_heirarchy_depth {
+sub get_tenant_hierarchy_depth {
#return "undef" in case of error
#a root tenant is of depth 0
@@ -284,9 +284,9 @@ sub get_tenant_heirarchy_depth {
while ( defined($iter_id) ) {
$iter_id = $tenants_data->{tenants_dict}{$iter_id}{parent};
$depth++;
- if ( $depth > $self->max_heirarchy_limit() ) {
+ if ( $depth > $self->max_hierarchy_limit() ) {
$self->_error(
-"Check tenancy depth for tenant $tenant_id - reached heirarchy limit"
+"Check tenancy depth for tenant $tenant_id - reached hierarchy limit"
);
return undef;
}
@@ -295,7 +295,7 @@ sub get_tenant_heirarchy_depth {
return $depth - 1;
}
-sub get_tenant_heirarchy_height {
+sub get_tenant_hierarchy_height {
#return "undef" in case of error
#a leaf tenant is of height 0
@@ -369,10 +369,10 @@ sub is_anchestor_of {
}
$iter_id = $tenants_data->{tenants_dict}{$iter_id}{parent};
$descendant_depth++;
- if ( $descendant_depth > $self->max_heirarchy_limit() )
+ if ( $descendant_depth > $self->max_hierarchy_limit() )
{ #recursion limit
$self->_error(
-"Tenants relation failed for tenants $anchestor_id / $descendant_id - reached heirarchy limit"
+"Tenants relation failed for tenants $anchestor_id / $descendant_id - reached hierarchy limit"
);
return undef;
}
@@ -381,7 +381,7 @@ sub is_anchestor_of {
return 0;
}
-sub max_heirarchy_limit {
+sub max_hierarchy_limit {
my $self = shift;
return 100;
}
@@ -401,15 +401,15 @@ sub _error {
}
}
-sub _is_resource_accessable {
+sub _is_resource_accessible {
my $self = shift;
my $tenants_data = shift;
my $resource_tenant = shift;
my $user_tenant = $self->current_user_tenant();
- return $self->_is_resource_accessable_to_tenant($tenants_data, $resource_tenant, $user_tenant)
+ return $self->_is_resource_accessible_to_tenant($tenants_data, $resource_tenant, $user_tenant)
}
-sub _is_resource_accessable_to_tenant {
+sub _is_resource_accessible_to_tenant {
my $self = shift;
my $tenants_data = shift;
my $resource_tenant = shift;
diff --git a/traffic_ops/app/public/js/jquery.dataTables.js b/traffic_ops/app/public/js/jquery.dataTables.js
index e749018a6..0454cd009 100644
--- a/traffic_ops/app/public/js/jquery.dataTables.js
+++ b/traffic_ops/app/public/js/jquery.dataTables.js
@@ -14330,7 +14330,7 @@
//
// Depreciated
- // The following properties are retained for backwards compatiblity only.
+ // The following properties are retained for backwards compatibility only.
// The should not be used in new projects and will be removed in a future
// version
//
diff --git a/traffic_ops/app/public/js/prettyprint.js b/traffic_ops/app/public/js/prettyprint.js
index 38e2b678a..9cf6dbfdc 100644
--- a/traffic_ops/app/public/js/prettyprint.js
+++ b/traffic_ops/app/public/js/prettyprint.js
@@ -317,7 +317,7 @@ var prettyPrint = (function(){
this.parentNode.appendChild( prettyPrintThis(obj,{maxDepth:1}) );
} catch(e) {
this.parentNode.appendChild(
- util.table(['ERROR OCCURED DURING OBJECT RETRIEVAL'],'error').addRow([e.message]).node
+ util.table(['ERROR OCCURRED DURING OBJECT RETRIEVAL'],'error').addRow([e.message]).node
);
}
}
diff --git a/traffic_ops/app/public/js/select2.js b/traffic_ops/app/public/js/select2.js
index 7116cd772..9826294fd 100644
--- a/traffic_ops/app/public/js/select2.js
+++ b/traffic_ops/app/public/js/select2.js
@@ -441,7 +441,7 @@ the specific language governing permissions and limitations under the Apache Lic
data: data,
success: function (data) {
// TODO - replace query.page with query so users have access to term, page, etc.
- // added query as third paramter to keep backwards compatibility
+ // added query as third parameter to keep backwards compatibility
var results = options.results(data, query.page, query);
query.callback(results);
},
diff --git a/traffic_ops/app/t/api/1.2/capabilities.t b/traffic_ops/app/t/api/1.2/capabilities.t
index 732daab19..1e710e818 100644
--- a/traffic_ops/app/t/api/1.2/capabilities.t
+++ b/traffic_ops/app/t/api/1.2/capabilities.t
@@ -169,7 +169,7 @@ $t->post_ok("/api/1.2/api_capabilities" => {Accept => 'application/json'} => jso
#test delete - should fail
$t->delete_ok("/api/1.2/capabilities/$cap_name")->status_is(400)
- ->json_is( "/alerts/0/text" => "Capability \'$cap_name\' is refered by an api_capability mapping: 1. Deletion failed." )
+ ->json_is( "/alerts/0/text" => "Capability \'$cap_name\' is referred by an api_capability mapping: 1. Deletion failed." )
, 'Did delete succeed?';
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice.t b/traffic_ops/app/t/api/1.2/deliveryservice.t
index 9f0b740a1..e168967c2 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice.t
@@ -62,7 +62,7 @@ ok $t->put_ok('/api/1.2/parameters/' . $useTenancyParamId => {Accept => 'applica
->json_is( "/response/name" => "use_tenancy" )
->json_is( "/response/configFile" => "global" )
->json_is( "/response/value" => $use_tenancy )
- , 'Was the disabling paramter set?';
+ , 'Was the disabling parameter set?';
# we will assign 2 more servers to ds 100
ok $t->post_ok('/api/1.2/deliveryserviceserver' => {Accept => 'application/json'} => json => {
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice_crud.t b/traffic_ops/app/t/api/1.2/deliveryservice_crud.t
index 1a0490852..7ca965125 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice_crud.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice_crud.t
@@ -56,7 +56,7 @@ sub run_ut {
->json_is( "/response/name" => "use_tenancy" )
->json_is( "/response/configFile" => "global" )
->json_is( "/response/value" => $use_tenancy )
- , 'Was the disabling paramter set?';
+ , 'Was the disabling parameter set?';
# It gets existing delivery services
ok $t->get_ok("/api/1.2/deliveryservices")->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content} } )
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice_regex.t b/traffic_ops/app/t/api/1.2/deliveryservice_regex.t
index 66f333bd3..ee38e8dd9 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice_regex.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice_regex.t
@@ -117,7 +117,7 @@ ok $t->put_ok('/api/1.2/parameters/' . $useTenancyParamId => {Accept => 'applica
->json_is( "/response/name" => "use_tenancy" )
->json_is( "/response/configFile" => "global" )
->json_is( "/response/value" => "0" )
- , 'Was the disabling paramter set?';
+ , 'Was the disabling parameter set?';
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice_user.t b/traffic_ops/app/t/api/1.2/deliveryservice_user.t
index 70794b126..05ca718b7 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice_user.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice_user.t
@@ -59,7 +59,7 @@ ok $t->put_ok('/api/1.2/parameters/' . $useTenancyParamId => {Accept => 'applica
->json_is( "/response/name" => "use_tenancy" )
->json_is( "/response/configFile" => "global" )
->json_is( "/response/value" => "0" )
- , 'Was the disabling paramter set?';
+ , 'Was the disabling parameter set?';
# there is currently 1 delivery service assigned to user with id=200
$t->get_ok('/api/1.2/users/200/deliveryservices')->status_is(200)->$count_response(1)
@@ -120,7 +120,7 @@ ok $t->put_ok('/api/1.2/parameters/' . $useTenancyParamId => {Accept => 'applica
->json_is( "/response/name" => "use_tenancy" )
->json_is( "/response/configFile" => "global" )
->json_is( "/response/value" => "1" )
- , 'Was the disabling paramter unset?';
+ , 'Was the disabling parameter unset?';
my $portal_user_id = $schema->resultset('TmUser')->find( { username => Test::TestHelper::PORTAL_ROOT_USER } )->id;
# there is currently 0 delivery service assigned to PORTAL_ROOT_USER, but the feature is disabled
diff --git a/traffic_ops/app/t/api/1.2/parameter.t b/traffic_ops/app/t/api/1.2/parameter.t
index 8d6ddd18d..6093fd0f6 100644
--- a/traffic_ops/app/t/api/1.2/parameter.t
+++ b/traffic_ops/app/t/api/1.2/parameter.t
@@ -62,7 +62,7 @@ ok $t->post_ok('/api/1.2/parameters' => {Accept => 'application/json'} => json =
->json_is( "/response/0/configFile" => "configFile10" )
->json_is( "/response/0/value" => "value10" )
->json_is( "/response/0/secure" => "0" )
- , 'Does the paramters created return?';
+ , 'Does the parameters created return?';
ok $t->post_ok('/api/1.2/parameters' => {Accept => 'application/json'} => json =>
[
@@ -88,7 +88,7 @@ ok $t->post_ok('/api/1.2/parameters' => {Accept => 'application/json'} => json =
->json_is( "/response/1/configFile" => "configFile2" )
->json_is( "/response/1/value" => "value2" )
->json_is( "/response/1/secure" => "1" )
- , 'Does the paramters created return?';
+ , 'Does the parameters created return?';
ok $t->post_ok('/api/1.2/parameters' => {Accept => 'application/json'} => json => [
{
@@ -122,7 +122,7 @@ ok $t->post_ok('/api/1.2/parameters' => {Accept => 'application/json'} => json =
])->status_is(400)
->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/alerts/0/text" => "parameter [name:param3 , configFile:configFile3 , value:value3] already exists." )
- , 'Does the paramters created return?';
+ , 'Does the parameters created return?';
ok $t->post_ok('/api/1.2/parameters' => {Accept => 'application/json'} => json => [
{
@@ -139,7 +139,7 @@ ok $t->post_ok('/api/1.2/parameters' => {Accept => 'application/json'} => json =
])->status_is(400)
->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/alerts/0/text" => 'parameter [name:param3 , configFile:configFile3 , value:value3] already exists.' )
- , 'Does the paramters create return?';
+ , 'Does the parameters create return?';
ok $t->post_ok('/api/1.2/parameters' => {Accept => 'application/json'} => json => [
{
@@ -153,7 +153,7 @@ ok $t->post_ok('/api/1.2/parameters' => {Accept => 'application/json'} => json =
}
])->status_is(400)
->or( sub { diag $t->tx->res->content->asset->{content}; } )
- , 'Does the paramters created return?';
+ , 'Does the parameters created return?';
my $para_id = &get_param_id('param2');
@@ -166,7 +166,7 @@ ok $t->put_ok('/api/1.2/parameters/' . $para_id => {Accept => 'application/json'
->json_is( "/response/configFile" => "configFile2" )
->json_is( "/response/value" => "value2.1" )
->json_is( "/response/secure" => "0" )
- , 'Does the paramters modified return?';
+ , 'Does the parameters modified return?';
ok $t->put_ok('/api/1.2/parameters/' . $para_id => {Accept => 'application/json'} => json => {
'name' => 'param2.1',
@@ -178,12 +178,12 @@ ok $t->put_ok('/api/1.2/parameters/' . $para_id => {Accept => 'application/json'
->json_is( "/response/configFile" => "configFile2.1" )
->json_is( "/response/value" => "value2.1" )
->json_is( "/response/secure" => "1" )
- , 'Does the paramters modified return?';
+ , 'Does the parameters modified return?';
ok $t->put_ok('/api/1.2/parameters/0' => {Accept => 'application/json'} => json => {
})->status_is(404)
->or( sub { diag $t->tx->res->content->asset->{content}; } )
- , 'Does the paramters modified return?';
+ , 'Does the parameters modified return?';
ok $t->delete_ok('/api/1.2/parameters/' . $para_id )->status_is(200)
->or( sub { diag $t->tx->res->content->asset->{content}; } )
@@ -213,7 +213,7 @@ ok $t->post_ok('/api/1.2/parameters/validate' => {Accept => 'application/json'}
->json_is( "/response/configFile" => "configFile1" )
->json_is( "/response/value" => "value1" )
->json_is( "/response/secure" => "0" )
- , 'Does the paramters validate return?';
+ , 'Does the parameters validate return?';
ok $t->post_ok('/api/1.2/parameters/validate' => {Accept => 'application/json'} => json => {
'configFile' => 'configFile1',
@@ -222,7 +222,7 @@ ok $t->post_ok('/api/1.2/parameters/validate' => {Accept => 'application/json'}
->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_like( "/alerts/0/text" => qr/is required.$/ )
->or( sub { diag $t->tx->res->content->asset->{content}; } )
- , 'Does the paramters validate return?';
+ , 'Does the parameters validate return?';
ok $t->post_ok('/api/1.2/parameters/validate' => {Accept => 'application/json'} => json => {
'name' => 'param1',
'value' => 'value1'
@@ -230,7 +230,7 @@ ok $t->post_ok('/api/1.2/parameters/validate' => {Accept => 'application/json'}
->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_like( "/alerts/0/text" => qr/is required.$/ )
->or( sub { diag $t->tx->res->content->asset->{content}; } )
- , 'Does the paramters validate return?';
+ , 'Does the parameters validate return?';
ok $t->post_ok('/api/1.2/parameters/validate' => {Accept => 'application/json'} => json => {
'name' => 'param1',
'configFile' => 'configFile1',
@@ -238,7 +238,7 @@ ok $t->post_ok('/api/1.2/parameters/validate' => {Accept => 'application/json'}
->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_like( "/alerts/0/text" => qr/is required.$/ )
->or( sub { diag $t->tx->res->content->asset->{content}; } )
- , 'Does the paramters validate return?';
+ , 'Does the parameters validate return?';
ok $t->post_ok('/api/1.2/parameters/validate' => {Accept => 'application/json'} => json => {
'name' => 'noexist',
'configFile' => 'noexist',
@@ -247,7 +247,7 @@ ok $t->post_ok('/api/1.2/parameters/validate' => {Accept => 'application/json'}
->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_like( "/alerts/0/text" => qr/does not exist.$/ )
->or( sub { diag $t->tx->res->content->asset->{content}; } )
- , 'Does the paramters validate return?';
+ , 'Does the parameters validate return?';
#checking if a parameter vaule can be changed to "0"
@@ -267,7 +267,7 @@ ok $t->get_ok('/api/1.2/parameters/'. $para_id)->status_is(200)
->json_is( "/response/0/name" => "default1" )
->json_is( "/response/0/value" => "1" )
->json_is( "/response/0/configFile" => "configFile3" )
- , 'Does the paramter get return?';
+ , 'Does the parameter get return?';
ok $t->put_ok('/api/1.2/parameters/' . $para_id => {Accept => 'application/json'} => json => {
'value' => '0',
@@ -276,7 +276,7 @@ ok $t->put_ok('/api/1.2/parameters/' . $para_id => {Accept => 'application/json'
->json_is( "/response/name" => "default1" )
->json_is( "/response/configFile" => "configFile3" )
->json_is( "/response/value" => "0" )
- , 'Was the paramters modification return?';
+ , 'Was the parameters modification return?';
ok $t->get_ok('/api/1.2/parameters/'. $para_id)->status_is(200)
->or( sub { diag $t->tx->res->content->asset->{content}; } )
@@ -286,7 +286,7 @@ ok $t->get_ok('/api/1.2/parameters/'. $para_id)->status_is(200)
, 'Was the parameter really changed?';
ok $t->delete_ok('/api/1.2/parameters/' . $para_id )->status_is(200)
- , 'Does the paramter deleted?';
+ , 'Does the parameter deleted?';
@@ -306,19 +306,19 @@ ok $t->post_ok('/api/1.2/parameters' => {Accept => 'application/json'} => json =
)->status_is(403)
->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/alerts/0/text" => "You must be an admin or oper to perform this operation!" )
- , 'Does the paramters created return?';
+ , 'Does the parameters created return?';
ok $t->put_ok('/api/1.2/parameters/' . $para_id => {Accept => 'application/json'} => json => {
})->status_is(403)
->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/alerts/0/text" => "You must be an admin or oper to perform this operation!" )
- , 'Does the paramters modified return?';
+ , 'Does the parameters modified return?';
$para_id = &get_param_id('param1');
ok $t->delete_ok('/api/1.2/parameters/' . $para_id )->status_is(403)
->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/alerts/0/text" => "You must be an admin or oper to perform this operation!" )
- , 'Does the paramter delete return?';
+ , 'Does the parameter delete return?';
$para_id = &get_param_id('domain_name');
ok $t->get_ok('/api/1.2/parameters/'. $para_id)->status_is(200)
@@ -327,7 +327,7 @@ ok $t->get_ok('/api/1.2/parameters/'. $para_id)->status_is(200)
->json_is( "/response/0/value" => "foo.com" )
->json_is( "/response/0/configFile" => "CRConfig.json" )
->json_is( "/response/0/secure" => "0" )
- , 'Does the paramter get return?';
+ , 'Does the parameter get return?';
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
diff --git a/traffic_ops/app/t/api/1.2/tenant.t b/traffic_ops/app/t/api/1.2/tenant.t
index 2d5398fcc..93c815031 100644
--- a/traffic_ops/app/t/api/1.2/tenant.t
+++ b/traffic_ops/app/t/api/1.2/tenant.t
@@ -192,29 +192,29 @@ ok $t->get_ok("/api/1.2/tenants")->status_is(200)
->json_is( "/response/4/id", $tenantE_id)
->json_is( "/response/1/id", $tenantB_id)->or( sub { diag $t->tx->res->content->asset->{content}; } );;
-#tenants heirarchy- test depth, height, root
+#tenants hierarchy- test depth, height, root
my $tenant_utils_of_root = Utils::Tenant->new(undef, $root_tenant_id, $schema);
my $tenants_data = $tenant_utils_of_root->create_tenants_data_from_db();
ok $tenant_utils_of_root->is_root_tenant($tenants_data, $root_tenant_id) == 1;
-ok $tenant_utils_of_root->get_tenant_heirarchy_depth($tenants_data, $root_tenant_id) == 0;
-ok $tenant_utils_of_root->get_tenant_heirarchy_height($tenants_data, $root_tenant_id) == 2;
+ok $tenant_utils_of_root->get_tenant_hierarchy_depth($tenants_data, $root_tenant_id) == 0;
+ok $tenant_utils_of_root->get_tenant_hierarchy_height($tenants_data, $root_tenant_id) == 2;
ok $tenant_utils_of_root->is_root_tenant($tenants_data, $tenantA_id) == 0;
-ok $tenant_utils_of_root->get_tenant_heirarchy_depth($tenants_data, $tenantA_id) == 1;
-ok $tenant_utils_of_root->get_tenant_heirarchy_height($tenants_data, $tenantA_id) == 1;
+ok $tenant_utils_of_root->get_tenant_hierarchy_depth($tenants_data, $tenantA_id) == 1;
+ok $tenant_utils_of_root->get_tenant_hierarchy_height($tenants_data, $tenantA_id) == 1;
ok $tenant_utils_of_root->is_root_tenant($tenants_data, $tenantB_id) == 0;
-ok $tenant_utils_of_root->get_tenant_heirarchy_depth($tenants_data, $tenantB_id) == 1;
-ok $tenant_utils_of_root->get_tenant_heirarchy_height($tenants_data, $tenantB_id) == 0;
+ok $tenant_utils_of_root->get_tenant_hierarchy_depth($tenants_data, $tenantB_id) == 1;
+ok $tenant_utils_of_root->get_tenant_hierarchy_height($tenants_data, $tenantB_id) == 0;
ok $tenant_utils_of_root->is_root_tenant($tenants_data, $tenantD_id) == 0;
-ok $tenant_utils_of_root->get_tenant_heirarchy_depth($tenants_data, $tenantD_id) == 2;
-ok $tenant_utils_of_root->get_tenant_heirarchy_height($tenants_data, $tenantD_id) == 0;
+ok $tenant_utils_of_root->get_tenant_hierarchy_depth($tenants_data, $tenantD_id) == 2;
+ok $tenant_utils_of_root->get_tenant_hierarchy_height($tenants_data, $tenantD_id) == 0;
ok $tenant_utils_of_root->is_root_tenant($tenants_data, $tenantE_id) == 0;
-ok $tenant_utils_of_root->get_tenant_heirarchy_depth($tenants_data, $tenantE_id) == 2;
-ok $tenant_utils_of_root->get_tenant_heirarchy_height($tenants_data, $tenantE_id) == 0;
+ok $tenant_utils_of_root->get_tenant_hierarchy_depth($tenants_data, $tenantE_id) == 2;
+ok $tenant_utils_of_root->get_tenant_hierarchy_height($tenants_data, $tenantE_id) == 0;
############################
#testing tenancy checks
@@ -275,7 +275,7 @@ ok $t->put_ok('/api/1.2/parameters/' . $useTenancyParamId => {Accept => 'applica
->json_is( "/response/name" => "use_tenancy" )
->json_is( "/response/configFile" => "global" )
->json_is( "/response/value" => "0" )
- , 'Was the disabling paramter set?';
+ , 'Was the disabling parameter set?';
my $tenant_utils_of_d_disabled = Utils::Tenant->new(undef, $tenantD_id, $schema);
my $tenants_data_of_d_disabled = $tenant_utils_of_d_disabled->create_tenants_data_from_db();
@@ -297,7 +297,7 @@ ok $t->put_ok('/api/1.2/parameters/' . $useTenancyParamId => {Accept => 'applica
->json_is( "/response/name" => "use_tenancy" )
->json_is( "/response/configFile" => "global" )
->json_is( "/response/value" => "1" )
- , 'Was the disabling paramter unset?';
+ , 'Was the disabling parameter unset?';
#################
diff --git a/traffic_ops/app/t/api/1.2/tenant_access.t b/traffic_ops/app/t/api/1.2/tenant_access.t
index 682d47d1a..38d2195d8 100644
--- a/traffic_ops/app/t/api/1.2/tenant_access.t
+++ b/traffic_ops/app/t/api/1.2/tenant_access.t
@@ -43,7 +43,7 @@ Test::TestHelper->load_core_data($schema);
#globals
my $root_tenant_id = get_tenant_id("root");
-# building the below heirarchy,
+# building the below hierarchy,
# and creating an admin user for each tenant
#
# -root
@@ -1754,5 +1754,5 @@ sub set_use_tenancy {
->json_is( "/response/name" => "use_tenancy" )
->json_is( "/response/configFile" => "global" )
->json_is( "/response/value" => $value )
- , 'Was the use_tenancy paramter set?';
+ , 'Was the use_tenancy parameter set?';
}
diff --git a/traffic_ops/app/t/api/1.2/user_admin.t b/traffic_ops/app/t/api/1.2/user_admin.t
index 39e5b91a4..88fabd9c4 100644
--- a/traffic_ops/app/t/api/1.2/user_admin.t
+++ b/traffic_ops/app/t/api/1.2/user_admin.t
@@ -62,7 +62,7 @@ sub run_ut {
->json_is( "/response/name" => "use_tenancy" )
->json_is( "/response/configFile" => "global" )
->json_is( "/response/value" => $use_tenancy )
- , 'Was the disabling paramter set?';
+ , 'Was the disabling parameter set?';
#adding a user
my $addedUserName = "user1";
diff --git a/traffic_ops/app/t/purge.t b/traffic_ops/app/t/purge.t
index dd3bdbea1..575f952d5 100644
--- a/traffic_ops/app/t/purge.t
+++ b/traffic_ops/app/t/purge.t
@@ -241,7 +241,7 @@ foreach my $cache ( keys %{$slist} ) {
ok( $content =~ qr/$test_string/m, $cache . ' should have test_string in regex_revalidate.config' );
}
else {
- # JvD note: there are mutliple delivery services that are in both CDNs but have the same origin.
+ # JvD note: there are multiple delivery services that are in both CDNs but have the same origin.
# if ( $ds_name !~ /omg-.*/ ) { #
# ok( $content !~ qr/$test_string/m, $cache . ' should not have test_string in regex_revalidate.config' );
# }
diff --git a/traffic_ops/experimental/auth/README.md b/traffic_ops/experimental/auth/README.md
index 3f5a9af1c..1554ffa68 100644
--- a/traffic_ops/experimental/auth/README.md
+++ b/traffic_ops/experimental/auth/README.md
@@ -18,7 +18,7 @@
-->
-A simple authentication server written in go that authenticates user agains the `tm_user` table and returns a jwt representing the user, incl. its API access capabilities, derived from the user's role.
+A simple authentication server written in go that authenticates user against the `tm_user` table and returns a jwt representing the user, incl. its API access capabilities, derived from the user's role.
* To run:
`go run auth.go auth.config my-secret`
diff --git a/traffic_ops/experimental/server/api/asn_test.go b/traffic_ops/experimental/server/api/asn_test.go
index 893c6b54c..50df055db 100644
--- a/traffic_ops/experimental/server/api/asn_test.go
+++ b/traffic_ops/experimental/server/api/asn_test.go
@@ -110,6 +110,6 @@ func TestAsn(t *testing.T) {
// Make sure all the right queries were seen
if err := mock.ExpectationsWereMet(); err != nil {
- t.Errorf("there were unfulfilled expections: %s", err)
+ t.Errorf("there were unfulfilled exceptions: %s", err)
}
}
diff --git a/traffic_ops/experimental/server/crconfig/crconfig.go b/traffic_ops/experimental/server/crconfig/crconfig.go
index b49e9571b..9755fecef 100644
--- a/traffic_ops/experimental/server/crconfig/crconfig.go
+++ b/traffic_ops/experimental/server/crconfig/crconfig.go
@@ -330,7 +330,7 @@ func contentRoutersSection(cdnName string, db *sqlx.DB) (map[string]ContentRoute
retMap := make(map[string]ContentRouter)
for _, row := range crs {
out := row
- out.HostName = "" // omitempty will make it dissapear
+ out.HostName = "" // omitempty will make it disappear
retMap[row.HostName] = out
}
@@ -348,7 +348,7 @@ func monitorSection(cdnName string, db *sqlx.DB) (map[string]Monitor, error) {
retMap := make(map[string]Monitor)
for _, row := range ms {
out := row
- out.HostName = "" // omitempty will make it dissapear
+ out.HostName = "" // omitempty will make it disappear
retMap[row.HostName] = out
}
@@ -366,7 +366,7 @@ func edgeLocationSection(cdnName string, db *sqlx.DB) (map[string]EdgeLocation,
retMap := make(map[string]EdgeLocation)
for _, row := range edges {
out := row
- out.Name = "" // omitempty will make it dissapear
+ out.Name = "" // omitempty will make it disappear
retMap[row.Name] = out
}
diff --git a/traffic_ops/install/bin/convert_profile/convert_profile.go b/traffic_ops/install/bin/convert_profile/convert_profile.go
index 143677ed7..4acf63924 100644
--- a/traffic_ops/install/bin/convert_profile/convert_profile.go
+++ b/traffic_ops/install/bin/convert_profile/convert_profile.go
@@ -191,7 +191,7 @@ func ValidateParameters(profile *Profile,
return true
}
-// ConvertProfile will modify paramaters as described by matching entries in conversionActions
+// ConvertProfile will modify parameters as described by matching entries in conversionActions
// If ignoreValue is set to true, the Value field in matcher will be ignored, effectively matching
// all values
func ConvertProfile(profile *Profile,
@@ -224,7 +224,7 @@ func ConvertProfile(profile *Profile,
profile.Parameters = filteredParams
}
-// paramsMatch returns true when param fulfills all matching critera in matcher
+// paramsMatch returns true when param fulfills all matching criteria in matcher
func paramsMatch(matcher Parameter, param Parameter, ignoreValue bool) bool {
nameRe := regexp.MustCompile(matcher.Name)
cfgRe := regexp.MustCompile(matcher.ConfigFile)
diff --git a/traffic_ops/traffic_ops_golang/api/api.go b/traffic_ops/traffic_ops_golang/api/api.go
index d1ec4f29f..c8d59a3d6 100644
--- a/traffic_ops/traffic_ops_golang/api/api.go
+++ b/traffic_ops/traffic_ops_golang/api/api.go
@@ -175,7 +175,7 @@ func WriteRespAlertObj(w http.ResponseWriter, r *http.Request, level tc.AlertLev
w.Write(respBts)
}
-// IntParams parses integer parameters, and returns map of the given params, or an error if any integer param is not an integer. The intParams may be nil if no integer parameters are required. Note this does not check existence; if an integer paramter is required, it should be included in the requiredParams given to NewInfo.
+// IntParams parses integer parameters, and returns map of the given params, or an error if any integer param is not an integer. The intParams may be nil if no integer parameters are required. Note this does not check existence; if an integer parameter is required, it should be included in the requiredParams given to NewInfo.
// This is a helper for the common case; not using this in unusual cases is perfectly acceptable.
func IntParams(params map[string]string, intParamNames []string) (map[string]int, error) {
intParams := map[string]int{}
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go
index b0887e98b..4d596c2e6 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go
@@ -291,7 +291,7 @@ func (ds *TODeliveryServiceV12) Delete() (error, error, int) {
}
if _, err := ds.ReqInfo.Tx.Tx.Exec(`DELETE FROM parameter WHERE name = 'location' AND config_file = ANY($1)`, pq.Array(configFiles)); err != nil {
- return nil, errors.New("TODeliveryServiceV12.Delete deleting delivery service parameteres: " + err.Error()), http.StatusInternalServerError
+ return nil, errors.New("TODeliveryServiceV12.Delete deleting delivery service parameters: " + err.Error()), http.StatusInternalServerError
}
return nil, nil, http.StatusOK
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/keys_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/keys_test.go
index 1bc2bd250..a13be59a0 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/keys_test.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/keys_test.go
@@ -207,7 +207,7 @@ func TestVerifyAndEncodeCertificate(t *testing.T) {
// should fail, can't verify self signed cert against this rootCA
dat, _, err = verifyCertificate(SelfSignedCertOnly, rootCA)
if err == nil {
- t.Errorf("Unexpected result, a certificate verification error should have occured")
+ t.Errorf("Unexpected result, a certificate verification error should have occurred")
}
// should pass, unknown authority is just a warning not an error
diff --git a/traffic_ops/traffic_ops_golang/monitoring/monitoring_test.go b/traffic_ops/traffic_ops_golang/monitoring/monitoring_test.go
index 053a9fdd0..309200183 100644
--- a/traffic_ops/traffic_ops_golang/monitoring/monitoring_test.go
+++ b/traffic_ops/traffic_ops_golang/monitoring/monitoring_test.go
@@ -121,7 +121,7 @@ func TestGetMonitoringServers(t *testing.T) {
}
if err := mock.ExpectationsWereMet(); err != nil {
- t.Errorf("there were unfulfilled expections: %s", err)
+ t.Errorf("there were unfulfilled exceptions: %s", err)
}
}
@@ -171,7 +171,7 @@ func TestGetCachegroups(t *testing.T) {
}
if err := mock.ExpectationsWereMet(); err != nil {
- t.Errorf("there were unfulfilled expections: %s", err)
+ t.Errorf("there were unfulfilled exceptions: %s", err)
}
}
@@ -359,7 +359,7 @@ func TestGetProfiles(t *testing.T) {
}
if err := mock.ExpectationsWereMet(); err != nil {
- t.Errorf("there were unfulfilled expections: %s", err)
+ t.Errorf("there were unfulfilled exceptions: %s", err)
}
}
@@ -421,7 +421,7 @@ func TestGetDeliveryServices(t *testing.T) {
}
if err := mock.ExpectationsWereMet(); err != nil {
- t.Errorf("there were unfulfilled expections: %s", err)
+ t.Errorf("there were unfulfilled exceptions: %s", err)
}
}
@@ -464,7 +464,7 @@ func TestGetConfig(t *testing.T) {
}
if err := mock.ExpectationsWereMet(); err != nil {
- t.Errorf("there were unfulfilled expections: %s", err)
+ t.Errorf("there were unfulfilled exceptions: %s", err)
}
}
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
index 38002f658..1b7d5dd36 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -72,12 +72,12 @@ var FormDeliveryServiceController = function(deliveryService, dsCurrent, origin,
$scope.COMPLETE = 4;
$scope.saveable = function() {
- // this may be overriden in a child class. i.e. FormEditDeliveryServiceController
+ // this may be overridden in a child class. i.e. FormEditDeliveryServiceController
return true;
};
$scope.deletable = function() {
- // this may be overriden in a child class. i.e. FormEditDeliveryServiceController
+ // this may be overridden in a child class. i.e. FormEditDeliveryServiceController
return true;
};
diff --git a/traffic_server/plugins/astats_over_http/README.md b/traffic_server/plugins/astats_over_http/README.md
index 122f0bed0..078a74760 100644
--- a/traffic_server/plugins/astats_over_http/README.md
+++ b/traffic_server/plugins/astats_over_http/README.md
@@ -30,6 +30,6 @@ start traffic server and visit http://[ip]:[port]/${path}
Rpm Builds
- Two spec files are provided. astats_over_http.spec requires a tar ball of this directoy
+ Two spec files are provided. astats_over_http.spec requires a tar ball of this directory
named astats_over_htt-.tar.gz is copied to the rpmbuild/SOURCES directory. The second
astats-git-build, checks out the source from the git repo and builds the rpm.
diff --git a/traffic_server/plugins/astats_over_http/astats.config.example b/traffic_server/plugins/astats_over_http/astats.config.example
index b71f518f0..6d7e1932c 100644
--- a/traffic_server/plugins/astats_over_http/astats.config.example
+++ b/traffic_server/plugins/astats_over_http/astats.config.example
@@ -7,6 +7,6 @@ allow_ip=127.0.0.1/32
allow_ip6=::1/64
# record_types
-# hexidecimal int (without 0x), each bit (1 through 7) representing a record type to return. 0x100 is for the built in system stats.
-# This can be overriden from the url, e.g.: http://localhost/_astats?record.types=100
+# hexadecimal int (without 0x), each bit (1 through 7) representing a record type to return. 0x100 is for the built in system stats.
+# This can be overridden from the url, e.g.: http://localhost/_astats?record.types=100
record_types=144
diff --git a/traffic_server/plugins/astats_over_http/astats_over_http.c b/traffic_server/plugins/astats_over_http/astats_over_http.c
index a1c569062..70f49b438 100644
--- a/traffic_server/plugins/astats_over_http/astats_over_http.c
+++ b/traffic_server/plugins/astats_over_http/astats_over_http.c
@@ -252,7 +252,7 @@ json_out_stat(TSRecordType rec_type, void *edata, int registered, const char *na
case TS_RECORDDATATYPE_STRING:
APPEND_STAT(name, "\"%s\"", datum->rec_string); break;
default:
- TSDebug(PLUGIN_TAG, "unkown type for %s: %d", name, data_type);
+ TSDebug(PLUGIN_TAG, "unknown type for %s: %d", name, data_type);
break;
}
}
diff --git a/traffic_stats/grafana/traffic_ops_cachegroup.js b/traffic_stats/grafana/traffic_ops_cachegroup.js
index a714a585c..37c5566d6 100644
--- a/traffic_stats/grafana/traffic_ops_cachegroup.js
+++ b/traffic_stats/grafana/traffic_ops_cachegroup.js
@@ -39,7 +39,7 @@ dashboard = {
// Set default time
-// time can be overriden in the url using from/to parameters, but this is
+// time can be overridden in the url using from/to parameters, but this is
// handled automatically in grafana core during dashboard initialization
dashboard.time = {
from: "now-6h",
diff --git a/traffic_stats/grafana/traffic_ops_deliveryservice.js b/traffic_stats/grafana/traffic_ops_deliveryservice.js
index 2508e3c86..c8acce397 100644
--- a/traffic_stats/grafana/traffic_ops_deliveryservice.js
+++ b/traffic_stats/grafana/traffic_ops_deliveryservice.js
@@ -39,7 +39,7 @@ dashboard = {
// Set default time
-// time can be overriden in the url using from/to parameters, but this is
+// time can be overridden in the url using from/to parameters, but this is
// handled automatically in grafana core during dashboard initialization
dashboard.time = {
from: "now-6h",
diff --git a/traffic_stats/grafana/traffic_ops_scripted.js b/traffic_stats/grafana/traffic_ops_scripted.js
index 78a5d87f3..64749c726 100644
--- a/traffic_stats/grafana/traffic_ops_scripted.js
+++ b/traffic_stats/grafana/traffic_ops_scripted.js
@@ -39,7 +39,7 @@ dashboard = {
// Set default time
-// time can be overriden in the url using from/to parameters, but this is
+// time can be overridden in the url using from/to parameters, but this is
// handled automatically in grafana core during dashboard initialization
dashboard.time = {
from: "now-6h",
diff --git a/traffic_stats/grafana/traffic_ops_server.js b/traffic_stats/grafana/traffic_ops_server.js
index 9efcfbd3c..3b20d6d47 100644
--- a/traffic_stats/grafana/traffic_ops_server.js
+++ b/traffic_stats/grafana/traffic_ops_server.js
@@ -39,7 +39,7 @@ dashboard = {
// Set default time
-// time can be overriden in the url using from/to parameters, but this is
+// time can be overridden in the url using from/to parameters, but this is
// handled automatically in grafana core during dashboard initialization
dashboard.time = {
from: "now-24h",
diff --git a/traffic_stats/influxdb_tools/create/create_ts_databases.go b/traffic_stats/influxdb_tools/create/create_ts_databases.go
index f0361892a..ee104091a 100644
--- a/traffic_stats/influxdb_tools/create/create_ts_databases.go
+++ b/traffic_stats/influxdb_tools/create/create_ts_databases.go
@@ -97,7 +97,7 @@ func createDailyStats(client influx.Client, replication int) {
func createDatabase(client influx.Client, db string) {
err := influxdb.Create(client, fmt.Sprintf("CREATE DATABASE %s", db))
if err != nil {
- fmt.Printf("An error occured creating the %v database: %v\n", db, err)
+ fmt.Printf("An error occurred creating the %v database: %v\n", db, err)
return
}
fmt.Println("Successfully created database: ", db)
@@ -110,7 +110,7 @@ func createRetentionPolicy(client influx.Client, db string, name string, duratio
}
err := influxdb.Create(client, qString)
if err != nil {
- fmt.Printf("An error occured creating the retention policy %s on database: %s: %v\n", name, db, err)
+ fmt.Printf("An error occurred creating the retention policy %s on database: %s: %v\n", name, db, err)
return
}
fmt.Printf("Successfully created retention policy %s for database: %s\n", name, db)
@@ -119,7 +119,7 @@ func createRetentionPolicy(client influx.Client, db string, name string, duratio
func createContinuousQuery(client influx.Client, name string, query string) {
err := influxdb.Create(client, query)
if err != nil {
- fmt.Printf("An error occured creating continuous query %s: %v\n", name, err)
+ fmt.Printf("An error occurred creating continuous query %s: %v\n", name, err)
return
}
fmt.Println("Successfully created continuous query ", name)
diff --git a/traffic_stats/influxdb_tools/sync/sync_ts_databases.go b/traffic_stats/influxdb_tools/sync/sync_ts_databases.go
index 16d2bd978..5891edaad 100644
--- a/traffic_stats/influxdb_tools/sync/sync_ts_databases.go
+++ b/traffic_stats/influxdb_tools/sync/sync_ts_databases.go
@@ -193,7 +193,7 @@ func syncCacheStat(sourceClient influx.Client, targetClient influx.Client, statN
fmt.Println("queryString ", queryString)
res, err := queryDB(sourceClient, queryString, db)
if err != nil {
- fmt.Printf("An error occured getting %s records from sourceDb\n", statName)
+ fmt.Printf("An error occurred getting %s records from sourceDb\n", statName)
return
}
sourceStats := getCacheStats(res)
@@ -201,7 +201,7 @@ func syncCacheStat(sourceClient influx.Client, targetClient influx.Client, statN
//get values from target DB
targetRes, err := queryDB(targetClient, queryString, db)
if err != nil {
- fmt.Printf("An error occured getting %s record from target db: %v\n", statName, err)
+ fmt.Printf("An error occurred getting %s record from target db: %v\n", statName, err)
return
}
targetStats := getCacheStats(targetRes)
@@ -265,14 +265,14 @@ func syncDeliveryServiceStat(sourceClient influx.Client, targetClient influx.Cli
fmt.Println("queryString ", queryString)
res, err := queryDB(sourceClient, queryString, db)
if err != nil {
- fmt.Printf("An error occured getting %s records from sourceDb: %v\n", statName, err)
+ fmt.Printf("An error occurred getting %s records from sourceDb: %v\n", statName, err)
return
}
sourceStats := getDeliveryServiceStats(res)
// get value from target DB
targetRes, err := queryDB(targetClient, queryString, db)
if err != nil {
- fmt.Printf("An error occured getting %s record from target db: %v\n", statName, err)
+ fmt.Printf("An error occurred getting %s record from target db: %v\n", statName, err)
return
}
targetStats := getDeliveryServiceStats(targetRes)
@@ -326,14 +326,14 @@ func syncDailyStat(sourceClient influx.Client, targetClient influx.Client, statN
}
res, err := queryDB(sourceClient, queryString, db)
if err != nil {
- fmt.Printf("An error occured getting %s records from sourceDb: %v\n", statName, err)
+ fmt.Printf("An error occurred getting %s records from sourceDb: %v\n", statName, err)
return
}
sourceStats := getDailyStats(res)
// get value from target DB
targetRes, err := queryDB(targetClient, queryString, db)
if err != nil {
- fmt.Printf("An error occured getting %s record from target db: %v\n", statName, err)
+ fmt.Printf("An error occurred getting %s record from target db: %v\n", statName, err)
return
}
targetStats := getDailyStats(targetRes)
diff --git a/traffic_stats/traffic_stats.go b/traffic_stats/traffic_stats.go
index e3bd54e6c..85ee6a3e6 100644
--- a/traffic_stats/traffic_stats.go
+++ b/traffic_stats/traffic_stats.go
@@ -295,7 +295,7 @@ func calcDailyMaxGbps(client influx.Client, bp influx.BatchPoints, startTime tim
log.Infof("queryString = %v\n", queryString)
res, err := queryDB(client, queryString, "cache_stats")
if err != nil {
- log.Errorf("An error occured getting max bandwidth! %v\n", err)
+ log.Errorf("An error occurred getting max bandwidth! %v\n", err)
return
}
if res != nil && len(res[0].Series) > 0 {
@@ -352,7 +352,7 @@ func calcDailyBytesServed(client influx.Client, bp influx.BatchPoints, startTime
log.Infof("queryString = %v\n", queryString)
res, err := queryDB(client, queryString, "cache_stats")
if err != nil {
- log.Error("An error occured getting max bandwidth!\n")
+ log.Error("An error occurred getting max bandwidth!\n")
return
}
if res != nil && len(res[0].Series) > 0 {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services