hiro/emacs-jupyter
1
0
Fork 0
mirror of https://github.com/vale981/emacs-jupyter synced 2025-03-05 07:41:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jupyter-start-kernel: Better error reporting during kernel startup

Browse source 
See https://github.com/dzop/emacs-jupyter/issues/70#issuecomment-476940527

* jupyter-kernel-manager.el
(jupyter--kernel-sentinel): Make ignored argument optional.
(jupyter--start-kernel): Don't set the process sentinel.
(jupyter-start-kernel): Report any errors after timeout.
Set the process sentinel as a last step.
This commit is contained in:
Nathaniel Nicandro 2019-03-27 14:10:52 -05:00
parent 4a01e375ae
commit ad5113b9a7
No known key found for this signature in database
GPG key ID: C34814B309DD06B8
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
jupyter-kernel-manager.el
View file

@ -117,7 +117,7 @@ connect to MANAGER's kernel."
(jupyter-initialize-connection client (oref manager session))
(oset client manager manager))))
(defun jupyter--kernel-sentinel (kernel _)
(defun jupyter--kernel-sentinel (kernel &optional _)
"Kill the KERNEL process and its buffer."
(when (memq (process-status kernel) '(exit signal))
(when (process-live-p kernel)
@ -139,21 +139,19 @@ ARGS should be a list of command line arguments used to start the
kernel process. The name of the command used to start the kernel
should be the first element of ARGS and the rest of the elements
of ARGS are the arguments of the command."
(let* ((process-environment
(append
;; The first entry takes precedence when duplicated variables
;; are found in `process-environment'
(cl-loop
for (k v) on env by #'cddr
collect (format "%s=%s" (cl-subseq (symbol-name k) 1) v))
process-environment))
(proc (apply #'start-process
(format "jupyter-kernel-%s" kernel-name)
(generate-new-buffer
(format " *jupyter-kernel[%s]*" kernel-name))
(car args) (cdr args))))
(prog1 proc
(set-process-sentinel proc #'jupyter--kernel-sentinel))))
(let ((process-environment
(append
;; The first entry takes precedence when duplicated variables are
;; found in `process-environment'
(cl-loop
for (k v) on env by #'cddr
collect (format "%s=%s" (cl-subseq (symbol-name k) 1) v))
process-environment)))
(apply #'start-process
(format "jupyter-kernel-%s" kernel-name)
(generate-new-buffer
(format " *jupyter-kernel[%s]*" kernel-name))
(car args) (cdr args))))
(cl-defgeneric jupyter-start-kernel ((manager jupyter-kernel-manager) &optional timeout)
"Start a kernel based on MANAGER's slots. Wait until TIMEOUT for startup.")
@ -214,7 +212,13 @@ kernel. Starting a kernel involves the following steps:
(jupyter-with-timeout
((format "Starting %s kernel process..." kernel-name)
(or timeout jupyter-long-timeout)
(error "Kernel did not read connection file within timeout"))
(if (process-live-p proc)
(error "Kernel did not read connection file within timeout")
(error "Kernel process exited:\n%s"
(with-current-buffer (process-buffer proc)
(prog1 (ansi-color-apply (buffer-string))
;; Now run the sentinel to cleanup resources
(jupyter--kernel-sentinel proc))))))
(let ((attribs (file-attributes conn-file)))
;; `file-attributes' can potentially return nil, in this case
;; just assume it has read the connection file so that we can
@ -222,10 +226,9 @@ kernel. Starting a kernel involves the following steps:
;; any messages we send it.
(or (null attribs)
(not (equal atime (nth 4 attribs))))))
(unless (process-live-p proc)
(error "Kernel process exited:\n%s"
(with-current-buffer (process-buffer proc)
(ansi-color-apply (buffer-string)))))))))))
;; Now set the sentinel of the kernel to cleanup resources if the
;; kernel dies later on.
(set-process-sentinel proc #'jupyter--kernel-sentinel)))))))
(cl-defmethod jupyter-start-channels ((manager jupyter-kernel-manager))
"Start a control channel on MANAGER."