klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-10 05:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wait for Khoj server to get ready before opening khoj.el transient menu

Browse Source 
- Use process filter, sentinel to mark when khoj server is ready or not
- Display server messages for visibility into server boot-up process
- Wait until server ready to open khoj transient menu in Emacs
  Until then khoj features wouldn't work anyway, so avoids confusion
This commit is contained in:
Debanjum Singh Solanky
2023-03-26 11:56:04 +07:00
parent 82eb4bfd0d
commit 50760acc37
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/interface/emacs/khoj.el
View File

@@ -218,7 +218,8 @@ for example), set this to the full interpreter path."
:group 'khoj) :group 'khoj)
(defvar khoj--server-process nil "Track Khoj server process.") (defvar khoj--server-process nil "Track Khoj server process.")
(defvar khoj--server-name "khoj-server" "Track Khoj server buffer.") (defvar khoj--server-name "*khoj-server*" "Track Khoj server buffer.")
(defvar khoj--server-ready? nil "Track if khoj server is ready to receive API calls.")
(defun khoj--server-get-version () (defun khoj--server-get-version ()
"Return the khoj server version." "Return the khoj server version."
@@ -250,14 +251,25 @@ for example), set this to the full interpreter path."
(format "--port=%s" server-port))))) (format "--port=%s" server-port)))))
(message "khoj.el: Starting server at %s %s..." server-host server-port) (message "khoj.el: Starting server at %s %s..." server-host server-port)
(setq khoj--server-process (setq khoj--server-process
(apply 'start-process (make-process
khoj--server-name :name khoj--server-name
khoj--server-name :buffer khoj--server-name
khoj-server-command :command (append (list khoj-server-command) server-args)
server-args)) :sentinel (lambda (process event)
(if (not khoj--server-process) (message "khoj.el: khoj server stopped with: %s" event)
(message "khoj.el: Failed to start Khoj server. Please start it manually by running `khoj' on terminal.\n%s" (buffer-string)) (setq khoj--server-ready? nil))
(message "khoj.el: Khoj server running at: %s" khoj-server-url)))) :filter (lambda (process msg)
(cond ((string-match (format "Uvicorn running on %s" khoj-server-url) msg)
(setq khoj--server-ready? t))
((not khoj--server-ready?)
(dolist (line (split-string msg "\n"))
(message "khoj.el: %s" (nth 1 (split-string msg " " t " *"))))))
;; call default process filter to write output to process buffer
(internal-default-process-filter process msg))
))
(set-process-query-on-exit-flag khoj--server-process nil)
(when (not khoj--server-process)
(message "khoj.el: Failed to start Khoj server. Please start it manually by running `khoj' on terminal.\n%s" (buffer-string)))))
(defun khoj--server-running? () (defun khoj--server-running? ()
"Check if the khoj server is running." "Check if the khoj server is running."
@@ -823,6 +835,8 @@ Paragraph only starts at first text after blank line."
(when (and (not (khoj--server-running?)) (when (and (not (khoj--server-running?))
(y-or-n-p "Could not connect to Khoj server. Should I install and start it?")) (y-or-n-p "Could not connect to Khoj server. Should I install and start it?"))
(khoj--server-setup)) (khoj--server-setup))
(while (not khoj--server-ready?)
(sleep-for 0.5))
(khoj-menu)) (khoj-menu))
(provide 'khoj) (provide 'khoj)