branch: elpa/hyperdrive
commit 570926de881e808939029be01307fb54f931d69a
Author: Joseph Turner <[email protected]>
Commit: Joseph Turner <[email protected]>
Change: (h/gateway-port) Rename from h/hyper-gateway-ushin-port
---
doc/hyperdrive.org | 2 +-
doc/hyperdrive.texi | 2 +-
hyperdrive-lib.el | 8 ++++----
hyperdrive-vars.el | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/doc/hyperdrive.org b/doc/hyperdrive.org
index 8c8e2577ed..3da3e83c97 100644
--- a/doc/hyperdrive.org
+++ b/doc/hyperdrive.org
@@ -1062,7 +1062,7 @@ DNS domains are checked for suspicious characters (see
You can adjust the following options in the customization interface by
running ~M-x customize-group RET hyperdrive RET~:
-- User Option: hyperdrive-hyper-gateway-ushin-port ::
+- User Option: hyperdrive-gateway-port ::
~hyperdrive.el~ will send HTTP requests to ~hyper-gateway-ushin~ on this
port.
Defaults to ~4973~.
diff --git a/doc/hyperdrive.texi b/doc/hyperdrive.texi
index f7260fdfe7..c724c7b9a0 100644
--- a/doc/hyperdrive.texi
+++ b/doc/hyperdrive.texi
@@ -1463,7 +1463,7 @@ DNS domains are checked for suspicious characters (see
You can adjust the following options in the customization interface by
running @code{M-x customize-group RET hyperdrive RET}:
-@defopt hyperdrive-hyper-gateway-ushin-port
+@defopt hyperdrive-gateway-port
@code{hyperdrive.el} will send HTTP requests to @code{hyper-gateway-ushin} on
this port.
Defaults to @code{4973}.
@end defopt
diff --git a/hyperdrive-lib.el b/hyperdrive-lib.el
index 09e88fe8a9..fe1556717a 100644
--- a/hyperdrive-lib.el
+++ b/hyperdrive-lib.el
@@ -154,7 +154,7 @@ See `hyperdrive-directory-sort' for the type of DIRECTION."
Calls `hyperdrive--httpify-url' to convert HYPER-URL starting
with `hyperdrive--hyper-prefix' to a URL starting with
\"http://localhost:4973/hyper/\"; (assuming that
-`hyperdrive-hyper-gateway-ushin-port' is \"4973\").
+`hyperdrive-gateway-port' is \"4973\").
REST is passed to `plz', which see.
@@ -220,7 +220,7 @@ this function."
"Return the name and version number of gateway as a plist.
If it's not running, signal an error."
(condition-case err
- (pcase-let* ((url (format "http://localhost:%d/";
h/hyper-gateway-ushin-port))
+ (pcase-let* ((url (format "http://localhost:%d/"; h/gateway-port))
((map name version) (plz 'get url :as #'json-read)))
(list :name name :version version))
(plz-error (h/api-default-else nil (caddr err)))))
@@ -246,7 +246,7 @@ PLZ-ERR should be a `plz-error' struct."
(defun h//httpify-url (url)
"Return localhost HTTP URL for HYPER-URL."
(format "http://localhost:%d/hyper/%s";
- h/hyper-gateway-ushin-port
+ h/gateway-port
(substring url (length h//hyper-prefix))))
(cl-defun h//write (url &key body then else queue)
@@ -1498,7 +1498,7 @@ process is running."
"Return non-nil if the gateway is running and accessible.
Times out after 2 seconds."
(ignore-errors
- (plz 'get (format "http://localhost:%d/"; h/hyper-gateway-ushin-port)
+ (plz 'get (format "http://localhost:%d/"; h/gateway-port)
:connect-timeout 2 :timeout 2)))
(defun h//gateway-wait-for-ready ()
diff --git a/hyperdrive-vars.el b/hyperdrive-vars.el
index 4ffaa2d2ca..cbbe809abd 100644
--- a/hyperdrive-vars.el
+++ b/hyperdrive-vars.el
@@ -38,9 +38,9 @@
:group 'external
:prefix "hyperdrive-")
-(defalias 'hyperdrive-hyper-gateway-port 'hyperdrive-hyper-gateway-ushin-port
+(defalias 'hyperdrive-hyper-gateway-port 'hyperdrive-gateway-port
"Renamed in hyperdrive.el v0.4.0 to reflect update to hyper-gateway-ushin.")
-(defcustom h/hyper-gateway-ushin-port 4973
+(defcustom h/gateway-port 4973
"Port to use to send requests to the hyper-gateway-ushin server."
:type 'natnum)
