hiro/emacs-ipython-notebook
1
0
Fork 0
mirror of https://github.com/vale981/emacs-ipython-notebook synced 2025-03-06 01:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for #63

Browse source 
EIN didn't know how to generate websocket URL's for remote hosts. It
does now.
This commit is contained in:
John Miller 2015-07-08 13:37:09 -05:00
parent 6d667f630a
commit e76251f8ef
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lisp/ein-kernel.el
View file

@ -173,13 +173,13 @@
(setq data (plist-get data :kernel))) (setq data (plist-get data :kernel)))
(destructuring-bind (&key id &allow-other-keys) data (destructuring-bind (&key id &allow-other-keys) data
(unless id (unless id
(error "Failed to start kernel. No `kernel_id' or `ws_url'. Got %S." (error "Failed to start kernel. No `kernel_id'. Got %S."
data)) data))
(ein:log 'info "Kernel started: %s" id) (ein:log 'info "Kernel started: %s" id)
(setf (ein:$kernel-running kernel) t) (setf (ein:$kernel-running kernel) t)
(setf (ein:$kernel-kernel-id kernel) id) (setf (ein:$kernel-kernel-id kernel) id)
(setf (ein:$kernel-session-id kernel) session-id) (setf (ein:$kernel-session-id kernel) session-id)
(setf (ein:$kernel-ws-url kernel) (ein:kernel--ws-url kernel id)) (setf (ein:$kernel-ws-url kernel) (ein:kernel--ws-url (ein:$kernel-url-or-port kernel)))
(setf (ein:$kernel-kernel-url kernel) (setf (ein:$kernel-kernel-url kernel)
(concat (ein:$kernel-base-url kernel) "/" id))) (concat (ein:$kernel-base-url kernel) "/" id)))
(ein:kernel-start-channels kernel) (ein:kernel-start-channels kernel)
@ -200,13 +200,14 @@
(ein:kernel--handle-channels-reply kernel packet))))))) (ein:kernel--handle-channels-reply kernel packet)))))))
(defun ein:kernel--ws-url (kernel ws_url) (defun ein:kernel--ws-url (url-or-port &optional securep)
"Use `ein:$kernel-url-or-port' if WS_URL is an empty string. "Use `ein:$kernel-url-or-port' if BASE_URL is an empty string.
See: https://github.com/ipython/ipython/pull/3307" See: https://github.com/ipython/ipython/pull/3307"
(if (string-match-p "^wss?://" ws_url) (let ((protocol (if securep "wss" "ws")))
ws_url (if (integerp url-or-port)
(let ((ein:url-localhost-template "ws://127.0.0.1:%s")) (format "%s://127.0.0.1:%s" protocol url-or-port)
(ein:url (ein:$kernel-url-or-port kernel))))) (let ((parsed-url (url-generic-parse-url url-or-port)))
(format "%s://%s:%s" protocol (url-host parsed-url) (url-port parsed-url))))))
(defun ein:kernel--websocket-closed (kernel ws-url early) (defun ein:kernel--websocket-closed (kernel ws-url early)