1
0
Fork 0
Browse Source

merge ack fix into vendored cl-stomp, load it in build system

master
eta 2 months ago
parent
commit
4ee3406ace
  1. 11
      deploy-web.lisp
  2. 11
      deploy.lisp
  3. 8
      vendor/cl-stomp/cl-stomp.lisp

11
deploy-web.lisp

@ -1,13 +1,4 @@ @@ -1,13 +1,4 @@
(format t "==> Loading Quicklisp~%")
(let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp"
(user-homedir-pathname))))
(unless quicklisp-init
(error "Quicklisp not installed. Consult https://www.quicklisp.org/beta/"))
(load quicklisp-init))
;; HACK(eta): We need to make sure Quicklisp knows how to find this system, sigh.
(push (uiop/os:getcwd) ql:*local-project-directories*)
(format t "==> Loading intertube system~%")
(ql:quickload :intertube)
(load "deploy-common.lisp")
(format t "==> Creating intertube-web executable~%")
(require :sb-sprof)
(sb-ext:save-lisp-and-die "./intertube-web" :toplevel #'intertube-web::main :executable t)

11
deploy.lisp

@ -1,13 +1,4 @@ @@ -1,13 +1,4 @@
(format t "==> Loading Quicklisp~%")
(let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp"
(user-homedir-pathname))))
(unless quicklisp-init
(error "Quicklisp not installed. Consult https://www.quicklisp.org/beta/"))
(load quicklisp-init))
;; HACK(eta): We need to make sure Quicklisp knows how to find this system, sigh.
(push (uiop/os:getcwd) ql:*local-project-directories*)
(format t "==> Loading intertube system~%")
(ql:quickload :intertube)
(load "deploy-common.lisp")
(format t "==> Creating intertube-scraper executable~%")
(require :sb-sprof)
;;(format t "=> Loaded track links:~% ~A~%" (alexandria:hash-table-alist trackernet::*per-line-track-graph*))

8
vendor/cl-stomp/cl-stomp.lisp vendored

@ -577,9 +577,11 @@ t :ack @@ -577,9 +577,11 @@ t :ack
(defmethod ack ((conn connection) (for-frame frame) &optional transaction)
"Send the client ack for FRAME and optional TRANSACTION"
(check-type transaction (or null string))
(sending-frame (conn frame "ACK"
"message-id" (get-header for-frame "message-id")
"transaction" transaction)))
(let ((ack-id (get-header for-frame "ack")))
(when ack-id
(sending-frame (conn frame "ACK"
"id" ack-id
"transaction" transaction)))))
(defmethod begin ((conn connection) (transaction string))
"Begin a transaction with name TRANSACTION"

Loading…
Cancel
Save