From 9c76df43fd6e67f2f60fa75029d3de7cb31edebb Mon Sep 17 00:00:00 2001
From: Cam Saul <cammsaul@gmail.com>
Date: Mon, 8 Apr 2019 17:21:55 -0700
Subject: [PATCH] Fix misspellings :writing_hand:
---
modules/drivers/druid/src/metabase/driver/druid.clj | 2 +-
modules/drivers/presto/src/metabase/driver/presto.clj | 2 +-
src/metabase/async/util.clj | 4 ++--
src/metabase/driver/sql_jdbc/execute.clj | 2 +-
src/metabase/middleware/auth.clj | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/drivers/druid/src/metabase/driver/druid.clj b/modules/drivers/druid/src/metabase/driver/druid.clj
index 9f4dc39a642..906ed8441ec 100644
--- a/modules/drivers/druid/src/metabase/driver/druid.clj
+++ b/modules/drivers/druid/src/metabase/driver/druid.clj
@@ -83,7 +83,7 @@
(if-not query-id
(log/warn interrupted-ex "Client closed connection, no queryId found, can't cancel query")
(ssh/with-ssh-tunnel [details-with-tunnel details]
- (log/warnf "Client closed connection, cancelling Druid queryId '%s'" query-id)
+ (log/warnf "Client closed connection, canceling Druid queryId '%s'" query-id)
(try
;; If we can't cancel the query, we don't want to hide the original exception, attempt to cancel, but if
;; we can't, we should rethrow the InterruptedException, not an exception from the cancellation
diff --git a/modules/drivers/presto/src/metabase/driver/presto.clj b/modules/drivers/presto/src/metabase/driver/presto.clj
index 349f0add4cb..74e9dbd426a 100644
--- a/modules/drivers/presto/src/metabase/driver/presto.clj
+++ b/modules/drivers/presto/src/metabase/driver/presto.clj
@@ -140,7 +140,7 @@
;; If we fail to cancel the query, log it but propogate the interrupted exception, instead of
;; covering it up with a failed cancel
(catch Exception e
- (log/error e (trs "Error cancelling query with ID {0}" id))))
+ (log/error e (trs "Error canceling query with ID {0}" id))))
(log/warn (trs "Client connection closed, no query-id found, can't cancel query")))
;; Propogate the error so that any finalizers can still run
(throw e)))))))))
diff --git a/src/metabase/async/util.clj b/src/metabase/async/util.clj
index 4a7e671038b..552e0035543 100644
--- a/src/metabase/async/util.clj
+++ b/src/metabase/async/util.clj
@@ -11,8 +11,8 @@
like.
Returns a channel that will send a single message when such early-closing cancelation occurs. You can listen for
- this message to implement special cancelation behavior, such as canceling async jobs. This channel automatically
- closes when either `in-chan` or `out-chan` closes."
+ this message to implement special cancelation/close behavior, such as canceling async jobs. This channel
+ automatically closes when either `in-chan` or `out-chan` closes."
[in-chan :- ManyToManyChannel, out-chan :- ManyToManyChannel]
(let [canceled-chan (a/chan 1)]
;; fire off a block that will wait for either in-chan to produce a result or out-chan to be closed
diff --git a/src/metabase/driver/sql_jdbc/execute.clj b/src/metabase/driver/sql_jdbc/execute.clj
index 4fa65c7861c..8a86ac8687c 100644
--- a/src/metabase/driver/sql_jdbc/execute.clj
+++ b/src/metabase/driver/sql_jdbc/execute.clj
@@ -182,7 +182,7 @@
@query-future)
(catch InterruptedException e
(log/warn e (tru "Client closed connection, cancelling query"))
- ;; This is what does the real work of cancelling the query. We aren't checking the result of
+ ;; This is what does the real work of canceling the query. We aren't checking the result of
;; `query-future` but this will cause an exception to be thrown, saying the query has been cancelled.
(.cancel stmt)
(throw e))))))
diff --git a/src/metabase/middleware/auth.clj b/src/metabase/middleware/auth.clj
index e3bcfe8c2ed..5f63a95f369 100644
--- a/src/metabase/middleware/auth.clj
+++ b/src/metabase/middleware/auth.clj
@@ -28,7 +28,7 @@
(defn enforce-api-key
- "Middleware that enforces validation of the client via API Key, cancelling the request processing if the check fails.
+ "Middleware that enforces validation of the client via API Key, canceling the request processing if the check fails.
Validation is handled by first checking for the presence of the `:metabase-api-key` on the request. If the api key
is available then we validate it by checking it against the configured `:mb-api-key` value set in our global config.
--
GitLab