aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-04-02 13:55:22 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-04-02 13:55:22 -0700
commit8f8c59341e7f420397f79d47af2787ca55fba07b (patch)
tree390981a20f68b80fba529f1269154c26d4494629 /src
parentf0aa90746c39bff31135eef4d53156d13543aaca (diff)
downloadconsfigurator-8f8c59341e7f420397f79d47af2787ca55fba07b.tar.gz
rename CONNECTION-TEARDOWN -> CONNECTION-TEAR-DOWN
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src')
-rw-r--r--src/connection.lisp6
-rw-r--r--src/connection/chroot.lisp2
-rw-r--r--src/connection/sudo.lisp2
-rw-r--r--src/deployment.lisp2
-rw-r--r--src/package.lisp2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/connection.lisp b/src/connection.lisp
index 7cefb6c..914c197 100644
--- a/src/connection.lisp
+++ b/src/connection.lisp
@@ -153,15 +153,15 @@ if they need to handle streams and strings differently."))
(let ((*connection* (slot-value connection 'parent)))
(call-next-method)))
-(defgeneric connection-teardown (connection)
+(defgeneric connection-tear-down (connection)
(:documentation "Subroutine to disconnect from the host."))
-(defmethod connection-teardown :around ((connection connection))
+(defmethod connection-tear-down :around ((connection connection))
(let ((*connection* (slot-value connection 'parent)))
(call-next-method)))
;; many connection types don't need anything to be done to disconnect
-(defmethod connection-teardown ((connection connection))
+(defmethod connection-tear-down ((connection connection))
(values))
(defgeneric connection-connattr (connection k)
diff --git a/src/connection/chroot.lisp b/src/connection/chroot.lisp
index e2aa10c..b681e48 100644
--- a/src/connection/chroot.lisp
+++ b/src/connection/chroot.lisp
@@ -147,7 +147,7 @@ should be the mount point, without the chroot's root prefixed.")
(format nil "chroot ~A sh -c ~A"
(sh-escape (slot-value connection 'into)) (sh-escape cmd)))
-(defmethod connection-teardown :before ((connection shell-chroot-connection))
+(defmethod connection-tear-down :before ((connection shell-chroot-connection))
(dolist (mount (chroot-mounts connection))
;; There shouldn't be any processes left running in the chroot after we've
;; finished deploying it, but it's quite easy to end up with things like
diff --git a/src/connection/sudo.lisp b/src/connection/sudo.lisp
index b8c7731..a8fa3dc 100644
--- a/src/connection/sudo.lisp
+++ b/src/connection/sudo.lisp
@@ -70,7 +70,7 @@
(string (code-char 13)))
:mode #o600)))))
-(defmethod connection-teardown :after ((connection sudo-connection))
+(defmethod connection-tear-down :after ((connection sudo-connection))
(when-let ((file (slot-value connection 'password-file)))
(delete-remote-trees file)))
diff --git a/src/deployment.lisp b/src/deployment.lisp
index 09fecd0..df1d243 100644
--- a/src/deployment.lisp
+++ b/src/deployment.lisp
@@ -59,7 +59,7 @@ preprocessed."
(if *connection*
(unwind-protect
(if remaining (connect remaining) (apply-*host*-propspec))
- (connection-teardown *connection*))
+ (connection-tear-down *connection*))
return)))))
(let ((*host* (preprocess-host host)))
(cond
diff --git a/src/package.lisp b/src/package.lisp
index 436bc54..3c8c52a 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -161,7 +161,7 @@
#:connection-readfile
#:connection-readfile-and-remove
#:connection-writefile
- #:connection-teardown
+ #:connection-tear-down
#:connection-connattr
#:propagate-connattr