me/guix
Archived
1
0
Fork 0
Code Activity

offload: Adjust default 'max-silent-time' value of 'open-ssh-session'.

Browse source 
* guix/scripts/offload.scm (open-ssh-session): Have 'max-silent-time'
default to #f rather than -1, which is not a valid timeout value.
Adjust body accordingly.
This commit is contained in:
Ludovic Courtès 2020-10-25 00:20:12 +02:00
parent d3f02752b5
commit c9278dc9c1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
guix/scripts/offload.scm
View file

@ -197,8 +197,10 @@ can interpret meaningfully."
private key from '~a': ~a") private key from '~a': ~a")
file str))))) file str)))))
(define* (open-ssh-session machine #:optional (max-silent-time -1)) (define* (open-ssh-session machine #:optional max-silent-time)
"Open an SSH session for MACHINE and return it. Throw an error on failure." "Open an SSH session for MACHINE and return it. Throw an error on failure.
When MAX-SILENT-TIME is true, it must be a positive integer denoting the
number of seconds after which the connection times out."
(let ((private (private-key-from-file* (build-machine-private-key machine))) (let ((private (private-key-from-file* (build-machine-private-key machine)))
(public (public-key-from-file (public (public-key-from-file
(string-append (build-machine-private-key machine) (string-append (build-machine-private-key machine)
@ -235,9 +237,10 @@ private key from '~a': ~a")
(leave (G_ "SSH public key authentication failed for '~a': ~a~%") (leave (G_ "SSH public key authentication failed for '~a': ~a~%")
(build-machine-name machine) (get-error session)))) (build-machine-name machine) (get-error session))))
;; From then on use MAX-SILENT-TIME as the absolute timeout when (when max-silent-time
;; reading from or write to a channel for this session. ;; From then on use MAX-SILENT-TIME as the absolute timeout when
(session-set! session 'timeout max-silent-time) ;; reading from or write to a channel for this session.
(session-set! session 'timeout max-silent-time))
session) session)
(x (x