diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-02-27 15:08:51 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-02-27 15:08:54 -0700 |
| commit | 17181036e4ed581abe2018230e892c7c252718ad (patch) | |
| tree | cff507027d6768e9e29417d4be0f7b3817f189f3 | |
| parent | 949abfab79922c5673d37bd142559c52faa4767c (diff) | |
| download | consfigurator-17181036e4ed581abe2018230e892c7c252718ad.tar.gz | |
Revert "define and bind *LAST-HOP-INFO*, *THIS-HOP-INFO*"
This reverts commit a67a873e251a868eb70996d9e9f425e0e14bc4d7.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| -rw-r--r-- | src/deployment.lisp | 24 | ||||
| -rw-r--r-- | src/package.lisp | 2 |
2 files changed, 8 insertions, 18 deletions
diff --git a/src/deployment.lisp b/src/deployment.lisp index 18a747d..2b96f80 100644 --- a/src/deployment.lisp +++ b/src/deployment.lisp @@ -108,13 +108,6 @@ DEFHOST forms can override earlier entries (see DEFHOST's docstring)." (eval-propspec-hostattrs ,propspec)) (deploy* ',connection ,new-host)))) -(defvar *last-hop-info* nil - "Plist of information about most recently established connection hop. Can be -used by implementations of ESTABLISH-CONNECTION.") - -(defvar *this-hop-info* nil - "Plist which will become the value of *LAST-HOP-INFO*.") - ;; this is the main do-work loop for Consfigurator; remote Lisp images are ;; instructed to pick up the remaining work of this loop (defun deploy* (connections host) @@ -127,15 +120,14 @@ used by implementations of ESTABLISH-CONNECTION.") (labels ((connect (connections) (destructuring-bind ((type . args) . remaining) connections - (let ((*last-hop-info* *this-hop-info*) *this-hop-info*) - ;; implementations of ESTABLISH-CONNECTION return nil if they - ;; have handed off to a remote Lisp image - (when-let ((*connection* - (apply #'establish-connection type remaining args))) - (if remaining - (connect remaining) - (apply-propspec (slot-value *host* 'propspec))) - (connection-teardown *connection*))))) + ;; implementations of ESTABLISH-CONNECTION return nil if they + ;; have handed off to a remote Lisp image + (when-let ((*connection* + (apply #'establish-connection type remaining args))) + (if remaining + (connect remaining) + (apply-propspec (slot-value *host* 'propspec))) + (connection-teardown *connection*)))) (apply-propspec (propspec) (when (and (subtypep (class-of *connection*) 'posix-connection) (eq :lisp (propspec->type propspec))) diff --git a/src/package.lisp b/src/package.lisp index e01b052..6aab491 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -103,8 +103,6 @@ #:deploy-these #:deploys #:deploys-these - #:*last-hop-info - #:*this-hop-info* ;; data.lisp #:data |